cactus-test-definitions 1.1.0__py3-none-any.whl → 1.2.0__py3-none-any.whl

cactus_test_definitions/__init__.py

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

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/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.1.0.dist-info → cactus_test_definitions-1.2.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cactus-test-definitions
-Version: 1.1.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.1.0.dist-info → cactus_test_definitions-1.2.0.dist-info}/RECORD

@@ -1,11 +1,11 @@
-cactus_test_definitions/__init__.py,sha256=X7Egj2Qk-g5THhynh-6tPQ59tyRBKl0Cz8KKpSNmPkk,987
+cactus_test_definitions/__init__.py,sha256=PUvdJH3ZVqVLdZL3Xyal76YRHmEg8b4HnVdTaQxChFw,987
 cactus_test_definitions/csipaus.py,sha256=HhBM6scS-Hlz8hFoGct7D2cJOK8NCN6f3CDP72gv7Dk,2864
 cactus_test_definitions/errors.py,sha256=_ZKl42SaEF5c2s9YySJUjGqVCBXSQYOLxpHQhSbNFug,458
 cactus_test_definitions/parameters.py,sha256=y2pCrE6MADXA53ZVZeNWj0_yWHcKOZ2imzjh_pZDorQ,6509
 cactus_test_definitions/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 cactus_test_definitions/schema.py,sha256=XYMlr2l_pfbyuwXLO88YryjObvxDVEV5IZ2hsThdy2k,736
 cactus_test_definitions/variable_expressions.py,sha256=6oVRj-6lXVKt6zIpSmXpzD2A8ayOWZ2eEpO5_uR6OdE,16741
-cactus_test_definitions/__pycache__/__init__.cpython-312.pyc,sha256=Fmo57KFxM3x-DxqFPEdR2sIPeUg3r1kHus-LZzquQ2U,941
+cactus_test_definitions/__pycache__/__init__.cpython-312.pyc,sha256=BVwVqT2NNBi0-KTRERaYeQi7kpXsejhJeXoTv0kGJFE,941
 cactus_test_definitions/__pycache__/actions.cpython-312.pyc,sha256=XwgSPYeaM1IHOO4g4l2uReYW7WYXmzknaRbwK1ttlh4,5469
 cactus_test_definitions/__pycache__/checks.cpython-312.pyc,sha256=Ql6kMtCPF30vUiwyVIfgvXvflApGgPLhuquTG5TTyos,7434
 cactus_test_definitions/__pycache__/csipaus.cpython-312.pyc,sha256=IdjCebmbzP_BbcuDegjZLU4iNQdX-ZKOLADqdHJdkMw,3177
@@ -28,7 +28,7 @@ cactus_test_definitions/client/__pycache__/checks.cpython-312.pyc,sha256=0mJ5tPa
 cactus_test_definitions/client/__pycache__/events.cpython-312.pyc,sha256=foHaDQq7KpzAZ-j9nSQKdCcYy0IZx0g5ZSCkFYFTEFg,3650
 cactus_test_definitions/client/__pycache__/test_procedures.cpython-312-pytest-8.3.5.pyc,sha256=dhs4Rti_k3tjssN-3vglLoQ2qM2NHuZ0go2bWdlgoSo,13208
 cactus_test_definitions/client/procedures/ALL-01.yaml,sha256=2RdNwqHMo-otjMEOoIwWgjOaTfj7_dRWfV2HGKMGQ-s,2246
-cactus_test_definitions/client/procedures/ALL-02.yaml,sha256=a7ykQVfu3Wazy1LBMOCZVYZkyAitpDt4MBgUq4ocRgE,2346
+cactus_test_definitions/client/procedures/ALL-02.yaml,sha256=oc4P8zd-J6pvVqaJqSSfaBYKP1mSu_9iCGYYhw2W9K4,2555
 cactus_test_definitions/client/procedures/ALL-03-REJ.yaml,sha256=TZcKMZqJmRwnsrBA9mhcngmVVJ9PCSVfmbAF4_2EOxQ,1924
 cactus_test_definitions/client/procedures/ALL-03.yaml,sha256=Qer-pPxkhbtTnlpbcgyBC59RB9IR_lHQ2U7idbWtFL8,2215
 cactus_test_definitions/client/procedures/ALL-04.yaml,sha256=pnfXRcu2H1q4xXZymXQFGf9qf4Q1ZMpoj2K6hP2U45c,1852
@@ -58,7 +58,7 @@ cactus_test_definitions/client/procedures/ALL-27.yaml,sha256=HIzw1VjCDrgdeLGUPpb
 cactus_test_definitions/client/procedures/ALL-28.yaml,sha256=i1yHOn27FChrrktVzNDZzPfNL9kDN31n-fDAQv_gnLU,6644
 cactus_test_definitions/client/procedures/ALL-29.yaml,sha256=bHOKU-rhwgqYsFZs2SOlj8iArbv0-OV_M691KTSCE_A,2373
 cactus_test_definitions/client/procedures/ALL-30.yaml,sha256=E0y-QMnro2A0cLEZQP3_zrgMSWgrEz4-EHxB_fxS72k,4704
-cactus_test_definitions/client/procedures/BES-01.yaml,sha256=HOYIEqaa_q9VSsiGv5cISJrQDoPj0Ry6qd5eVTfkDwE,3219
+cactus_test_definitions/client/procedures/BES-01.yaml,sha256=Cyee2mlhsB5bXzlQPGRDTBMsifQvcPc216ePHrMPPj4,3185
 cactus_test_definitions/client/procedures/BES-02.yaml,sha256=a1VQ1e4r4fO6LqlV6-ivIdg0S_0vgSTcSs8lB3RRZkk,3154
 cactus_test_definitions/client/procedures/BES-03.yaml,sha256=Sem23i5kkegx7UFAd8Qy4p6qXcLTQdiVRGhbMkWEtIc,3315
 cactus_test_definitions/client/procedures/BES-04.yaml,sha256=Xp9tCaXvskhtIuUvsuBZoGoCWHTrCEC6McqCEbqQoMo,5854
@@ -115,7 +115,7 @@ cactus_test_definitions/server/procedures/S-OPT-02.yaml,sha256=jMoMRo_vgfaB9yoY9
 cactus_test_definitions/server/procedures/S-OPT-03.yaml,sha256=tOzDTOE9D-CWT61RuWRTDGcpt7W57NcH9_eZvQyLhFs,980
 cactus_test_definitions/server/procedures/S-OPT-04.yaml,sha256=o33HNLTzxQm__KbFW1x2ce04uW-xx6Li0aijJI_XbYQ,667
 cactus_test_definitions/server/procedures/test-procedures.yaml,sha256=3GqHgROh3YvenXB3RH9lg05809IqAtp_uohT_hUdyIE,395
-cactus_test_definitions-1.1.0.dist-info/licenses/LICENSE.txt,sha256=xCq-ofiZHRqQJHkhY1M-eXahPozfXmo9qvez6BiCOdk,1074
+cactus_test_definitions-1.2.0.dist-info/licenses/LICENSE.txt,sha256=xCq-ofiZHRqQJHkhY1M-eXahPozfXmo9qvez6BiCOdk,1074
 tests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 tests/unit/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 tests/unit/test_csipaus.py,sha256=edFnWDlHgMuW7CK9l8z-FHA1GcIACVJ1RPERiFuWfcY,1959
@@ -129,7 +129,7 @@ tests/unit/client/test_events.py,sha256=bXDW0Ykx9hqh8MLv1b_9a942LahlhE3L2pu7NyGs
 tests/unit/client/test_test_procedures.py,sha256=GKOQo007C4o4DbsCL4aJfpPqz108ueQ-zJUpwHu56Uw,6950
 tests/unit/server/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 tests/unit/server/test_test_procedures.py,sha256=5yC3Npq6PrDqj4A3URcFd5-0cXmLooxWt51OXJ4Kd0U,3976
-cactus_test_definitions-1.1.0.dist-info/METADATA,sha256=wQ_HQvIgvaGBVwL7p4gDHaqNLoR0OUCattXfG9kEbPs,21248
-cactus_test_definitions-1.1.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-cactus_test_definitions-1.1.0.dist-info/top_level.txt,sha256=4tQTXLPjTzH6OYZqOj40IX8XgosTUTUEJTESjtj0KfI,30
-cactus_test_definitions-1.1.0.dist-info/RECORD,,
+cactus_test_definitions-1.2.0.dist-info/METADATA,sha256=9JXbXfXYhxZnrgqJicrBOjRQht7ZB2QxoqPz1hd5UO4,21248
+cactus_test_definitions-1.2.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+cactus_test_definitions-1.2.0.dist-info/top_level.txt,sha256=4tQTXLPjTzH6OYZqOj40IX8XgosTUTUEJTESjtj0KfI,30
+cactus_test_definitions-1.2.0.dist-info/RECORD,,