cactus-test-definitions 1.0.0__tar.gz → 1.2.0__tar.gz

{cactus_test_definitions-1.0.0/cactus_test_definitions.egg-info → cactus_test_definitions-1.2.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cactus-test-definitions
-Version: 1.0.0
+Version: 1.2.0
 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>

{cactus_test_definitions-1.0.0 → cactus_test_definitions-1.2.0}/cactus_test_definitions/__init__.py

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

{cactus_test_definitions-1.0.0 → cactus_test_definitions-1.2.0}/cactus_test_definitions/client/procedures/ALL-02.yaml

@@ -44,28 +44,33 @@ Steps:
       - type: enable-steps
         parameters:
           steps:
-            - GET-EDEV
+            - POST-EDEV
             - GET-TM
       - type: remove-steps
         parameters:
           steps:
             - GET-DCAP
   
+  #
+  # NOTE - Pending review by the CIRG - this has been disabled as a client seeing an EndDeviceListLink with all=0
+  #        can reasonably be expected to skip this step.
+  #
   # (g, h, i)
-  GET-EDEV:
-    event:
-      type: GET-request-received
-      parameters:
-        endpoint: /edev
-    actions:
-      - type: enable-steps
-        parameters:
-          steps:
-            - POST-EDEV
-      - type: remove-steps
-        parameters:
-          steps:
-            - GET-EDEV
+  # GET-EDEV:
+  #   event:
+  #     type: GET-request-received
+  #     parameters:
+  #       endpoint: /edev
+  #   actions:
+  #     - type: enable-steps
+  #       parameters:
+  #         steps:
+  #           - POST-EDEV
+  #     - type: remove-steps
+  #       parameters:
+  #         steps:
+  #           - GET-EDEV
+
   # (m, n, o)
   GET-TM:
     event:

{cactus_test_definitions-1.0.0 → cactus_test_definitions-1.2.0}/cactus_test_definitions/client/procedures/ALL-09.yaml

@@ -13,25 +13,33 @@ Criteria:
       parameters: {}
     - type: der-capability-contents
       parameters:
-        rtgMaxChargeRateW: true # Maximum rate of energy transfer received
-        rtgMaxDischargeRateW: true # Maximum rate of energy transfer delivered
-        rtgMaxVA: true # Maximum apparent power
-        rtgMaxVar: true # Maximum reactive power delivered
-        rtgMaxVarNeg: true # Maximum reactive power received
+        #
+        # NOTE - These checks have been loosened from TS:5573 (which requires EVERYTHING) until clarification on
+        #        about what the MINIMUM subset of values is determined for each class of device
+        #
+        # rtgMaxChargeRateW: true # Maximum rate of energy transfer received
+        # rtgMaxDischargeRateW: true # Maximum rate of energy transfer delivered
+        # rtgMaxVA: true # Maximum apparent power
+        # rtgMaxVar: true # Maximum reactive power delivered
+        # rtgMaxVarNeg: true # Maximum reactive power received
         rtgMaxW: true # Maximum active power
-        rtgMinPFOverExcited: true # Minimum power factor displacement
-        rtgMinPFUnderExcited: true # Minimum power factor displacement
+        # rtgMinPFOverExcited: true # Minimum power factor displacement
+        # rtgMinPFUnderExcited: true # Minimum power factor displacement
         doeModesSupported: true # CSIP-Aus DOE modes supported
     - type: der-settings-contents
       parameters:
-        setMaxChargeRateW: true # Maximum rate of energy transfer received
-        setMaxDischargeRateW: true # Maximum rate of energy transfer delivered
-        setMaxVA: true # Maximum apparent power
-        setMaxVar: true # Maximum reactive power delivered
-        setMaxVarNeg: true # Maximum reactive power received
+        #
+        # NOTE - These checks have been loosened from TS:5573 (which requires EVERYTHING) until clarification on
+        #        about what the MINIMUM subset of values is determined for each class of device
+        #
+        # setMaxChargeRateW: true # Maximum rate of energy transfer received
+        # setMaxDischargeRateW: true # Maximum rate of energy transfer delivered
+        # setMaxVA: true # Maximum apparent power
+        # setMaxVar: true # Maximum reactive power delivered
+        # setMaxVarNeg: true # Maximum reactive power received
         setMaxW: true # Maximum active power
-        setMinPFOverExcited: true # Minimum power factor displacement
-        setMinPFUnderExcited: true # Minimum power factor displacement
+        # setMinPFOverExcited: true # Minimum power factor displacement
+        # setMinPFUnderExcited: true # Minimum power factor displacement
         doeModesEnabled: true # CSIP-Aus DOE modes enabled
     - type: der-status-contents
       parameters: {}

{cactus_test_definitions-1.0.0 → cactus_test_definitions-1.2.0}/cactus_test_definitions/client/procedures/ALL-15.yaml

@@ -1,7 +1,7 @@
 Description: Active Controls – Energize/de-energize
 Category: Control
 Classes:
-  - A
+  # Note - A is explicitly omitted, this test is ONLY for subscription clients
   - S
 
 TargetVersions:

{cactus_test_definitions-1.0.0 → cactus_test_definitions-1.2.0}/cactus_test_definitions/client/procedures/ALL-16.yaml

@@ -1,7 +1,7 @@
 Description: Active Controls – Disconnect
 Category: Control
 Classes:
-  - A
+  # Note - A is explicitly omitted, this test is ONLY for subscription clients
   - S
 
 TargetVersions:

{cactus_test_definitions-1.0.0 → cactus_test_definitions-1.2.0}/cactus_test_definitions/client/procedures/ALL-17.yaml

@@ -1,7 +1,7 @@
 Description: Default Controls – Ramp Rate
 Category: Control
 Classes:
-  - A
+  # Note - A is explicitly omitted, this test is ONLY for subscription clients
   - S
 
 TargetVersions:

{cactus_test_definitions-1.0.0 → cactus_test_definitions-1.2.0}/cactus_test_definitions/client/procedures/BES-01.yaml

@@ -11,7 +11,7 @@ Criteria:
     - type: all-steps-complete
       parameters: {}
 
-    # Test includes ~ 5 minutes of waiting + initial reading sent during test
+    # Test includes ~ 6 minutes of waiting 
     # A minimum of 4 readings is required by the test procedure
     - type: readings-der-stored-energy
       parameters: { "minimum_count": 4 }
@@ -89,6 +89,12 @@ Steps:
       parameters:
         duration_seconds: 180 # Wait for at least 2 sets of readings to arrive (with post rate 60 seconds)
     actions:
+      - type: create-der-control
+        parameters:
+          start: $(now)
+          duration_seconds: 600
+          opModStorageTargetW: 0
+          primacy: 0
       - type: enable-steps
         parameters:
           steps:
@@ -105,12 +111,6 @@ Steps:
       parameters:
         endpoint: /edev/1/derp/1/derc
     actions:
-      - type: create-der-control
-        parameters:
-          start: $(now)
-          duration_seconds: 600
-          opModStorageTargetW: 0
-          primacy: 0
       - type: enable-steps
         parameters:
           steps:
@@ -126,7 +126,7 @@ Steps:
     event:
       type: wait
       parameters:
-        duration_seconds: 180 # Wait for at least 3 sets of readings to arrive (with post rate 60 seconds)
+        duration_seconds: 180 # Wait for at least 2 sets of readings to arrive (with post rate 60 seconds)
     actions:
       - type: remove-steps
         parameters:

{cactus_test_definitions-1.0.0 → cactus_test_definitions-1.2.0/cactus_test_definitions.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cactus-test-definitions
-Version: 1.0.0
+Version: 1.2.0
 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>