cactus-test-definitions 1.6.0__py3-none-any.whl → 1.8.1__py3-none-any.whl

cactus_test_definitions/server/README.md

@@ -93,8 +93,8 @@ action:
 
 | **name** | **params** | **description** |
 | -------- | ---------- | --------------- |
-| `discovery` | `resources: list[CSIPAusResource]` `next_polling_window: bool/None` | Performs a full discovery / refresh of the client's context from DeviceCapability downwards, looking to discover the specific resources. Can be delayed until the next polling window. |
-| `notifications` | `collect: bool` `disable: bool` | If `collect`, consumes subscription notifications and inserts them into the current context, if `disable` causes the subscription notification webhook to simulate an outage (return HTTP 5XX) |
+| `discovery` | `resources: list[CSIPAusResource]` `next_polling_window: bool/None` `list_limit: int/None` | Performs a full discovery / refresh of the client's context from DeviceCapability downwards, looking to discover the specific resources. Can be delayed until the next polling window and/or fixed to ONLY fetch a maximum number of entities. |
+| `notifications` | `sub_id: str` `collect: bool/None` `disable: bool/None` | `sub_id` must match a previously created subscription. If `collect`, consumes subscription notifications and inserts them into the current context, if `disable` causes the subscription notification webhook to simulate an outage (return HTTP 5XX) |
 | `wait` | `duration_seconds: int` | Performs no action for the nominated period of time |
 | `refresh-resource` | `resource: CSIPAusResource` `expect_rejection: bool/None` `expect_rejection_or_empty: bool/None` | Forces a particular resource to be refreshed (using existing hrefs in context). Can be set to expect a HTTP 4XX ErrorResponse and/or an empty list resource (if appropriate). |
 | `insert-end-device` | `force_lfdi: str/None` `expect_rejection: bool/None` | Causes the client to submit a new EndDevice registration and resolves the returned Location header |
@@ -104,7 +104,7 @@ action:
 | `upsert-der-status` | `genConnectStatus: int/None` `operationalModeStatus: int/None` `alarmStatus: int/None` `expect_rejection: bool/None` | Sends DERStatus - validates that the server persisted the values correctly |
 | `upsert-der-capability` | `type: int` `rtgMaxW: int` `modesSupported: int` `doeModesSupported: int` | Sends DERCapability - validates that the server persisted the values correctly |
 | `upsert-der-settings` | `setMaxW: int` `setGradW: int` `modesEnabled: int` `doeModesEnabled: int` | Sends DERSettings - validates that the server persisted the values correctly |
-| `send-malformed-der-settings` | `updatedTime_missing: bool` `modesEnabled_int: bool`  | Sends a malformed DERSettings - expects a failure and that the server will NOT change anything |
+| `send-malformed-der-settings` | `updatedTime_missing: bool` | Sends a malformed DERSettings - expects a failure and that the server will NOT change anything |
 | `send-malformed-response` | `mrid_unknown: bool` `endDeviceLFDI_unknown: bool` `response_invalid: bool`  | Sends a malformed Response (using the most recent DERControl replyTo) - expects a failure response |
 | `create-subscription` | `sub_id: str` `resource: CSIPAusResource` | Sends a new Subscription - validates that the server persisted the values correctly via Location. `sub_id` will alias this subscription for future action calls. |
 | `delete-subscription` | `sub_id: str` | Sends a deletion for a previously created Subscription. |
@@ -119,10 +119,12 @@ A `Check` is a boolean test of what the client has in its current context. They
 | -------- | ---------- | --------------- |
 | `discovered` | `resources: list[CSIPAusResource]` `links: list[CSIPAusResource]` | Does the client's context have the nominated resources (or the parent resource with an appropriate link). |
 | `time-sync` | None | Does the client have a TimeResponse and does it closely map to the client's local time. |
+| `function-set-assignment` | `minimum_count: int/None` `maximum_count: int/None` `matches_client_edev: bool/None` | Are there the correct number of FunctionSetAssignments that may or may not belong solely under the client's EndDevice (or any accessible EndDevice) |
+| `end-device-list` | `minimum_count: int/None` `maximum_count: int/None` `poll_rate: int/None` `sub_id: str/None` | Are there a correct number of EndDeviceList that match the filter criteria |
 | `end-device` | `matches_client: bool` `matches_pin` | Is there an EndDevice that matches the client's LFDI (can be negatively asserted) and does it have a specific Registration PIN |
-| `der-program` | `minimum_count: int/None` `maximum_count: int/None` `primacy: int/None` `fsa_index: int/None` | Are there enough DERProgram(s) that satisfy the filter criteria? `fsa_index` matches DERPrograms that belong to the nth (0 based) FunctionSetAssignment |
-| `der-control` | `minimum_count: int/None` `maximum_count: int/None` `latest: bool/None` `opModImpLimW: float/None` `opModExpLimW: float/None` `opModLoadLimW: float/None` `opModGenLimW: float/None` `opModEnergize: bool/None` `opModConnect: bool/None` `opModFixedW: float/None` `rampTms: int/None` `randomizeStart: int/None` `event_status: int/None` `responseRequired: int/None` `derp_primacy: int/None` | Are there enough DERProgram(s) that satisfy the filter criteria? `latest` will ONLY match the most recent DERControl. |
-| `default-der-control` | `opModExpLimW: float/None` `opModLoadLimW: float/None` `opModGenLimW: float/None` `setGradW: int/None` |  matches any DefaultDERControl with the specified values |
+| `der-program` | `minimum_count: int/None` `maximum_count: int/None` `primacy: int/None` `fsa_index: int/None` `sub_id: str/None` | Are there enough DERProgram(s) that satisfy the filter criteria? `fsa_index` matches DERPrograms that belong to the nth (0 based) FunctionSetAssignment (negative values count from end of list - eg -1 would match the last FSA) |
+| `der-control` | `minimum_count: int/None` `maximum_count: int/None` `latest: bool/None` `opModImpLimW: float/None` `opModExpLimW: float/None` `opModLoadLimW: float/None` `opModGenLimW: float/None` `opModEnergize: bool/None` `opModConnect: bool/None` `opModFixedW: float/None` `rampTms: int/None` `randomizeStart: int/None` `event_status: int/None` `responseRequired: int/None` `derp_primacy: int/None` `sub_id: str/None` | Are there enough DERProgram(s) that satisfy the filter criteria? `latest` will ONLY match the most recent DERControl. |
+| `default-der-control` | `minimum_count: int/None` `maximum_count: int/None` `opModExpLimW: float/None` `opModLoadLimW: float/None` `opModGenLimW: float/None` `setGradW: int/None` `sub_id: str/None` |  Are there the correct number of DefaultDERControl instances with the specified values |
 | `mirror-usage-point` | `matches: bool` `location: CSIPAusReadingLocation/None` `reading_types: list[CSIPAusReadingType]/None` `mmr_mrids: list[str]/None` `post_rate_seconds: int/None` | Does a MirrorUsagePoint exist with the specified values (or not exist if `matches` is false). Only asserts specified values. |
 | `subscription` | `matches: bool` `resource: CSIPAusResource`| Does a Subscription exist for the specified resource (or not exist if `matches` is false). |
 | `poll-rate` | `resource: CSIPAusResource` `poll_rate_seconds: int` | Does the nominated resource have the specified poll rate. |

cactus_test_definitions/server/__init__.py

@@ -7,6 +7,8 @@ from cactus_test_definitions.server.test_procedures import (
     TestProcedureId,
     get_all_test_procedures,
     get_test_procedure,
+    get_yaml_contents,
+    parse_test_procedure,
 )
 
 __all__ = [
@@ -20,4 +22,6 @@ __all__ = [
     "TestProcedure",
     "get_all_test_procedures",
     "get_test_procedure",
+    "get_yaml_contents",
+    "parse_test_procedure",
 ]

cactus_test_definitions/server/actions.py

@@ -38,8 +38,10 @@ ACTION_PARAMETER_SCHEMA: dict[str, dict[str, ParameterSchema]] = {
         "next_polling_window": ParameterSchema(
             False, ParameterType.Boolean
         ),  # If set - delay this until the upcoming polling window (eg- wait for the next whole minute)
+        "list_limit": ParameterSchema(False, ParameterType.Integer),
     },  # Performs a full discovery / refresh of the client's context from DeviceCapability downwards
     "notifications": {
+        "sub_id": ParameterSchema(True, ParameterType.String),  # Must match a previously created subscription
         "collect": ParameterSchema(
             False, ParameterType.Boolean
         ),  # Collects latest subscription notifications into context
@@ -105,7 +107,6 @@ ACTION_PARAMETER_SCHEMA: dict[str, dict[str, ParameterSchema]] = {
     },  # Sends DERSettings - validates that the server persisted the values correctly
     "send-malformed-der-settings": {
         "updatedTime_missing": ParameterSchema(True, ParameterType.Boolean),  # If true - updatedTime will be stripped
-        "modesEnabled_int": ParameterSchema(True, ParameterType.Boolean),  # If true - modesEnabled will send an int
     },  # Sends a malformed DERSettings - expects a failure and that the server will NOT change anything
     "send-malformed-response": {
         "mrid_unknown": ParameterSchema(True, ParameterType.Boolean),  # If true - mrid will be random

cactus_test_definitions/server/checks.py

@@ -41,6 +41,26 @@ CHECK_PARAMETER_SCHEMA: dict[str, dict[str, ParameterSchema]] = {
         "links": ParameterSchema(False, ParameterType.ListCSIPAusResource),
     },
     "time-synced": {},  # Passes if the current Time resource is synced with this client's date/time
+    "function-set-assignment": {
+        "minimum_count": ParameterSchema(False, ParameterType.Integer),  # Needs at least this many FSAs to pass
+        "maximum_count": ParameterSchema(False, ParameterType.Integer),  # Needs at most this many FSAs to pass
+        "matches_client_edev": ParameterSchema(
+            False, ParameterType.Boolean
+        ),  # If True - only FSAs assigned to the client's EndDevice will be counted
+        "sub_id": ParameterSchema(
+            False, ParameterType.String
+        ),  # If set - only FSAs received via this subscription will be counted
+    },
+    "end-device-list": {
+        "minimum_count": ParameterSchema(False, ParameterType.Integer),  # Needs at least this many edev lists to pass
+        "maximum_count": ParameterSchema(False, ParameterType.Integer),  # Needs at most this many edev lists to pass
+        "poll_rate": ParameterSchema(
+            False, ParameterType.Integer
+        ),  # If set - will only count an EndDeviceList with this exact pollRate
+        "sub_id": ParameterSchema(
+            False, ParameterType.String
+        ),  # If set - only EndDeviceLists received via this subscription will be counted
+    },
     "end-device": {
         "matches_client": ParameterSchema(
             True, ParameterType.Boolean
@@ -56,6 +76,9 @@ CHECK_PARAMETER_SCHEMA: dict[str, dict[str, ParameterSchema]] = {
         "fsa_index": ParameterSchema(
             False, ParameterType.Integer
         ),  # Filters derps that belong to the nth (0 based) FunctionSetAssignment index
+        "sub_id": ParameterSchema(
+            False, ParameterType.String
+        ),  # Filters derps to only those received via this named subscription
     },
     "der-control": {
         "minimum_count": ParameterSchema(False, ParameterType.Integer),  # Needs at least this many controls to pass
@@ -75,13 +98,25 @@ CHECK_PARAMETER_SCHEMA: dict[str, dict[str, ParameterSchema]] = {
         "derp_primacy": ParameterSchema(
             False, ParameterType.Integer
         ),  # Filter to control's belonging to a DERProgram with this primacy value
+        "sub_id": ParameterSchema(
+            False, ParameterType.String
+        ),  # Filters control to only those received via this named subscription
+        "duration": ParameterSchema(False, ParameterType.Integer),  # Filter on duration value
     },  # Matches many DERControls (specified by minimum_count) against additional other filter criteria
     "default-der-control": {
+        "minimum_count": ParameterSchema(False, ParameterType.Integer),  # Needs at least this many default der controls
+        "maximum_count": ParameterSchema(False, ParameterType.Integer),  # Needs at most this many default der controls
         "opModImpLimW": ParameterSchema(False, ParameterType.Float),
         "opModExpLimW": ParameterSchema(False, ParameterType.Float),
         "opModGenLimW": ParameterSchema(False, ParameterType.Float),
         "opModLoadLimW": ParameterSchema(False, ParameterType.Float),
         "setGradW": ParameterSchema(False, ParameterType.Integer),  # Hundredths of a percent / second
+        "sub_id": ParameterSchema(
+            False, ParameterType.String
+        ),  # Filters default control to only those received via this named subscription
+        "derp_primacy": ParameterSchema(
+            False, ParameterType.Integer
+        ),  # Filter to control's belonging to a DERProgram with this primacy value
     },  # matches any DefaultDERControl with the specified values
     "mirror-usage-point": {
         "matches": ParameterSchema(True, ParameterType.Boolean),  # True for positive assert, False for negative assert

cactus_test_definitions/server/procedures/S-ALL-01.yaml

@@ -12,6 +12,9 @@ Preconditions:
   
 Steps:
   - id: DISCOVERY
+    repeat_until_pass: true
+    instructions:
+      - Create an EndDevice record with an lfdi/sfdi that matches your client. Ensure it has a single DER record.
     action: 
       type: discovery
       parameters:

cactus_test_definitions/server/procedures/S-ALL-06.yaml

@@ -0,0 +1,111 @@
+Description: Mirror Usage Point Creation and Individual Readings
+Category: Monitoring
+Classes:
+ - A
+
+TargetVersions:
+ - v1.2
+
+Preconditions:
+  required_clients:
+    - id: client
+
+Steps:
+  - id: PRECONDITION
+    repeat_until_pass: true
+    instructions:
+      - Create an EndDevice registration for client.
+    action:
+      type: discovery
+      parameters:
+        resources:
+          - EndDevice
+          - DeviceCapability
+          - MirrorUsagePointList
+          - DER
+    checks:
+      - type: end-device # This will be the check that will block UNTIL there is an existing EndDevice registration
+        parameters:
+          matches_client: true
+
+  - id: 1 - DISCOVER INITIAL MUPS
+    repeat_until_pass: true
+    action: 
+      type: discovery
+      parameters:
+        resources:
+          - MirrorUsagePoint
+    checks:
+      - type: mirror-usage-point
+        parameters:
+          matches: false # MirrorUsagePoints must be initially empty for client.
+
+  - id: 2,3A - CREATE MUP FOR SITE
+    action: 
+      type: upsert-mup
+      parameters:
+        mup_id: mup_site
+        location: Site
+        reading_types: 
+          - ActivePowerAverage
+          - ReactivePowerAverage
+          - FrequencyAverage
+          - VoltageSinglePhaseAverage
+    checks:
+      - type: mirror-usage-point
+        parameters:
+          location: Site
+          matches: true
+          reading_types: 
+          - ActivePowerAverage
+          - ReactivePowerAverage
+          - FrequencyAverage
+          - VoltageSinglePhaseAverage
+
+  - id: 2,3B - CREATE MUP FOR DEVICE
+    action: 
+      type: upsert-mup
+      parameters:
+        mup_id: mup_device
+        location: Device
+        reading_types: 
+          - ActivePowerAverage
+          - ReactivePowerAverage
+          - FrequencyAverage
+          - VoltageSinglePhaseAverage
+    checks:
+      - type: mirror-usage-point
+        parameters:
+          location: Device
+          matches: true
+          reading_types: 
+          - ActivePowerAverage
+          - ReactivePowerAverage
+          - FrequencyAverage
+          - VoltageSinglePhaseAverage
+
+  - id: 4A - POST READINGS TO SITE
+    action: 
+      type: insert-readings
+      parameters:
+        mup_id: mup_site
+        values:
+          ActivePowerAverage: [5000, 5100, 5200, 5300]
+          ReactivePowerAverage: [1000, 1100, 1200, 1300]
+          FrequencyAverage: [50.0, 50.1, 49.9, 50.0]
+          VoltageSinglePhaseAverage: [230.0, 231.0, 229.0, 230.5]
+
+  - id: 4B - POST READINGS TO DEVICE
+    action: 
+      type: insert-readings
+      parameters:
+        mup_id: mup_device
+        values:
+          ActivePowerAverage: [5000, 5100, 5200, 5300]
+          ReactivePowerAverage: [1000, 1100, 1200, 1300]
+          FrequencyAverage: [50.0, 50.1, 49.9, 50.0]
+          VoltageSinglePhaseAverage: [230.0, 231.0, 229.0, 230.5]
+
+  # NOTE: The final step of this test (5) is to verify that readings are retained correctly by the server.
+  # As href is optional, it is assumed many servers will not currently support this.
+  # While waiting for a discussion by the CIRG it has been decided to omit this step of testing for now.

cactus_test_definitions/server/procedures/S-ALL-07.yaml

@@ -0,0 +1,100 @@
+Description: S-ALL-07 Select Edge Cases for Telemetry Reporting
+Category: Monitoring
+Classes:
+ - A
+
+TargetVersions:
+ - v1.2
+
+Preconditions:
+  required_clients:
+    - id: client
+
+Steps:
+  - id: PRECONDITION
+    repeat_until_pass: true
+    instructions:
+      - Create an EndDevice registration for client.
+      - Configure utility server with client's Private Enterprise Number (PEN).
+    action: 
+      type: discovery
+      parameters:
+        resources:
+          - EndDevice
+          - DER
+          - MirrorUsagePoint
+    checks:
+      - type: end-device 
+        parameters:
+          matches_client: true
+
+  - id: Create MUP # Post an initial MirrorUsagePoint to be overwritten later.
+    action: 
+      type: upsert-mup
+      parameters:
+        mup_id: mup_mrid_1
+        reading_types: 
+          - ActivePowerAverage
+          - VoltageSinglePhaseAverage
+        location: Site  # Set the roleflage
+    checks:
+      - type: mirror-usage-point
+        parameters:
+          matches: true
+          reading_types: 
+            - ActivePowerAverage
+            - VoltageSinglePhaseAverage
+          location: Site
+
+  - id: STEP 1 - UPDATE MUP ROLEFLAGS # Post same MirrorUsagePoint mRID with different roleFlags
+    action: 
+      type: upsert-mup
+      parameters:
+        mup_id: mup_mrid_1
+        reading_types: 
+          - ActivePowerAverage
+          - VoltageSinglePhaseAverage
+        location: Device  # Update the roleflage
+    checks:
+      - type: mirror-usage-point
+        parameters:
+          matches: true
+          reading_types: 
+            - ActivePowerAverage
+            - VoltageSinglePhaseAverage
+          location: Device
+
+  - id: POST INITIAL READING
+    action: 
+      type: insert-readings
+      parameters:
+        mup_id: mup_mrid_1
+        values:
+          ActivePowerAverage: [5000]
+          VoltageSinglePhaseAverage: [240.0]
+
+  - id: STEP 2 - UPDATE READING # Post MirrorMeterReading with same mmr mRID but different value
+    action: 
+      type: insert-readings
+      parameters:
+        mup_id: mup_mrid_1
+        values:
+          ActivePowerAverage: [6000]  # The mmr mrid will automatically be the same as the initial reading
+        # NOTE: We do not have the option to request readings, so cannot verify the result of this upsert
+  
+  - id: STEP 3 - Update MUP type  # Post MirrorMeterReading with same mRID and no value (change the reading type)
+    action: 
+      type: upsert-mup
+      parameters:
+        mup_id: mup_mrid_1
+        reading_types: 
+          - ReactivePowerAverage
+        location: Device
+    checks:
+      - type: mirror-usage-point
+        parameters:
+          matches: true
+          reading_types:
+            - ReactivePowerAverage
+            - VoltageSinglePhaseAverage
+          location: Device

cactus_test_definitions/server/procedures/S-ALL-08.yaml

@@ -0,0 +1,77 @@
+Description: S-ALL-08 Connection Status 
+Category: Monitoring
+Classes:
+ - A
+
+TargetVersions:
+ - v1.2
+
+Preconditions:
+  required_clients:
+    - id: client
+
+Steps:
+  - id: PRECONDITION
+    repeat_until_pass: true
+    instructions:
+      - Create an EndDevice registration for client.
+    action: 
+      type: discovery
+      parameters:
+        resources:
+          - EndDevice
+          - DER
+    checks:
+      - type: end-device 
+        parameters:
+          matches_client: true
+      - type: discovered
+        parameters:
+          links:
+            - DERStatus
+
+  - id: INITIALISE DER STATUS
+    action: 
+      type: upsert-der-status
+      parameters:
+        genConnectStatus: 7  # 0111 - connected
+
+  - id: STEP 1 - DISCONNECT # bit 0 = 0
+    action: 
+      type: upsert-der-status
+      parameters:
+        genConnectStatus: 6  # 0110
+
+  - id: STEP 2 - RECONNECT
+    action: 
+      type: upsert-der-status
+      parameters:
+        genConnectStatus: 7
+
+  - id: STEP 3 - UNAVAILABLE  # bit 1 = 0
+    action: 
+      type: upsert-der-status
+      parameters:
+        genConnectStatus: 5  # 0101
+
+  - id: STEP 4 - RECONNECT
+    instructions:
+      - Reconnect DER
+    action: 
+      type: upsert-der-status
+      parameters:
+        genConnectStatus: 7  # 0111
+
+  - id: STEP 5 - NON-OPERATING # bit 2 = 0
+    action: 
+      type: upsert-der-status
+      parameters:
+        genConnectStatus: 3  # 0011
+
+  - id: STEP 6 - RECONNECT
+    instructions:
+      - Reconnect DER
+    action: 
+      type: upsert-der-status
+      parameters:
+        genConnectStatus: 7

cactus_test_definitions/server/procedures/S-ALL-09.yaml

@@ -0,0 +1,43 @@
+Description: S-ALL-09 Operational Mode Status 
+Category: Monitoring
+Classes:
+ - A
+
+TargetVersions:
+ - v1.2
+
+Preconditions:
+  required_clients:
+    - id: client
+
+Steps:
+  - id: PRECONDITION
+    repeat_until_pass: true
+    instructions:
+      - Create an EndDevice registration for client.
+    action: 
+      type: discovery
+      parameters:
+        resources:
+          - EndDevice
+          - DER
+    checks:
+      - type: end-device 
+        parameters:
+          matches_client: true
+      - type: discovered
+        parameters:
+          links:
+            - DERStatus
+
+  - id: STEP 1 - Set Online
+    action: 
+      type: upsert-der-status
+      parameters:
+        operationalModeStatus: 1
+
+  - id: STEP 2 - Set Offline
+    action: 
+      type: upsert-der-status
+      parameters:
+        operationalModeStatus: 2

cactus_test_definitions/server/procedures/S-ALL-10.yaml

@@ -0,0 +1,68 @@
+Description: S-ALL-10 Capabilities and Settings
+Category: Monitoring
+Classes:
+ - A
+
+TargetVersions:
+ - v1.2
+
+Preconditions:
+  required_clients:
+    - id: client
+
+Steps:
+  - id: PRECONDITION
+    repeat_until_pass: true
+    instructions:
+      - Create an EndDevice registration for client.
+    action: 
+      type: discovery
+      parameters:
+        resources:
+          - EndDevice
+          - DER
+    checks:
+      - type: end-device 
+        parameters:
+          matches_client: true
+      - type: discovered
+        parameters:
+          links:
+            - DERCapability
+            - DERSettings
+
+  - id: STEP 1A - Put DERCapability
+    action: 
+      type: upsert-der-capability
+      parameters:
+        type: 4
+        rtgMaxW: 10000
+        modesSupported: 3
+        doeModesSupported: 3
+
+  - id: STEP 1B - Put DERSettings
+    action: 
+      type: upsert-der-settings
+      parameters:
+        setMaxW: 10000
+        setGradW: 1000
+        modesEnabled: 3
+        doeModesEnabled: 3
+
+  - id: STEP 2A - UPSERT DERCapability
+    action: 
+      type: upsert-der-capability
+      parameters:
+        type: 5
+        rtgMaxW: 11000
+        modesSupported: 4
+        doeModesSupported: 4
+
+  - id: STEP 2B - UPSERT DERSettings
+    action: 
+      type: upsert-der-settings
+      parameters:
+        setMaxW: 11000
+        setGradW: 1100
+        modesEnabled: 4
+        doeModesEnabled: 4

cactus_test_definitions/server/procedures/S-ALL-11.yaml

@@ -0,0 +1,36 @@
+Description: Active Control - Export Limit
+Category: Control
+Classes:
+ - A
+
+TargetVersions:
+ - v1.2
+
+Preconditions:
+  required_clients:
+    - id: client
+  
+Steps:
+  - id: (A) PRECONDITION
+    repeat_until_pass: true
+    client: client
+    instructions:
+      - Create an EndDevice registration.
+      - Configure an active control with opModExpLimW = 0W and no rampTms attribute.
+    action: 
+      type: discovery
+      parameters:
+        resources:
+          - EndDevice
+          - DERControlList
+          - DER
+          - DERControl
+    checks:
+      - type: end-device 
+        parameters:
+          matches_client: true 
+      - type: der-control
+        parameters:
+          minimum_count: 1
+          opModExpLimW: 0
+          rampTms: null

cactus_test_definitions/server/procedures/S-ALL-12.yaml

@@ -0,0 +1,36 @@
+Description: Active Control - Generation Limit 
+Category: Control
+Classes:
+ - A
+
+TargetVersions:
+ - v1.2
+
+Preconditions:
+  required_clients:
+    - id: client
+  
+Steps:
+  - id: (A) PRECONDITION
+    repeat_until_pass: true
+    client: client
+    instructions:
+      - Create an EndDevice registration.
+      - Configure an active control with opModGenLimW = 0W and no rampTms attribute.
+    action: 
+      type: discovery
+      parameters:
+        resources:
+          - EndDevice
+          - DERControlList
+          - DER
+          - DERControl
+    checks:
+      - type: end-device 
+        parameters:
+          matches_client: true 
+      - type: der-control
+        parameters:
+          minimum_count: 1
+          opModGenLimW: 0
+          rampTms: null

cactus_test_definitions/server/procedures/S-ALL-13.yaml

@@ -0,0 +1,36 @@
+Description: Active Control - Import Limit
+Category: Control
+Classes:
+ - A
+
+TargetVersions:
+ - v1.2
+
+Preconditions:
+  required_clients:
+    - id: client
+  
+Steps:
+  - id: (A) PRECONDITION
+    repeat_until_pass: true
+    client: client
+    instructions:
+      - Create an EndDevice registration.
+      - Configure an active control with opModImpLimW = 0W and no rampTms attribute.
+    action: 
+      type: discovery
+      parameters:
+        resources:
+          - EndDevice
+          - DERControlList
+          - DER
+          - DERControl
+    checks:
+      - type: end-device 
+        parameters:
+          matches_client: true 
+      - type: der-control
+        parameters:
+          minimum_count: 1
+          opModImpLimW: 0
+          rampTms: null