[Asterisk-code-review] Testsuite: Refactored RLS Test Module Configuration (testsuite[master])

Anonymous Coward asteriskteam at digium.com
Wed Nov 11 15:52:50 CST 2015


Anonymous Coward #1000019 has submitted this change and it was merged.

Change subject: Testsuite: Refactored RLS Test Module Configuration
......................................................................


Testsuite: Refactored RLS Test Module Configuration

While this does not actually correct the issue with the test failure (which
incidentally turns out is not localized to this test), this patch modifies the
the test config structure such that the full_state and resources collections
are now represented by a single collection, packets. Having them disconnected
in the configuration was obscuring the intent.

This is part three (3) of an n-patch series of refactorings to help determine
the root cause of the test failure and correct pylint issues.

ASTERISK-25430
Reported By: Ashley Sanders

Change-Id: Iefaefddff202e1c4caf334b71ba6a51827bb91b5
---
M tests/channels/pjsip/subscriptions/rls/lists/nominal/mwi/batched/basic/test-config.yaml
M tests/channels/pjsip/subscriptions/rls/lists/nominal/mwi/batched/multiple_resources_single_change/test-config.yaml
M tests/channels/pjsip/subscriptions/rls/lists/nominal/mwi/batched/resubscription_interruption/test-config.yaml
M tests/channels/pjsip/subscriptions/rls/lists/nominal/mwi/batched/single_resource_multiple_changes/test-config.yaml
M tests/channels/pjsip/subscriptions/rls/lists/nominal/mwi/batched/termination_interruption/test-config.yaml
M tests/channels/pjsip/subscriptions/rls/lists/nominal/mwi/full_state/test-config.yaml
M tests/channels/pjsip/subscriptions/rls/lists/nominal/mwi/initial_notify/test-config.yaml
M tests/channels/pjsip/subscriptions/rls/lists/nominal/mwi/partial_state/test-config.yaml
M tests/channels/pjsip/subscriptions/rls/lists/nominal/mwi/resubscribe_full_state/test-config.yaml
M tests/channels/pjsip/subscriptions/rls/lists/nominal/mwi/termination_full_state/test-config.yaml
M tests/channels/pjsip/subscriptions/rls/lists/nominal/presence/batched/basic/test-config.yaml
M tests/channels/pjsip/subscriptions/rls/lists/nominal/presence/batched/multiple_resources_single_change/test-config.yaml
M tests/channels/pjsip/subscriptions/rls/lists/nominal/presence/batched/resubscription_interruption/test-config.yaml
M tests/channels/pjsip/subscriptions/rls/lists/nominal/presence/batched/single_resource_multiple_changes/test-config.yaml
M tests/channels/pjsip/subscriptions/rls/lists/nominal/presence/batched/termination_interruption/test-config.yaml
M tests/channels/pjsip/subscriptions/rls/lists/nominal/presence/full_state/test-config.yaml
M tests/channels/pjsip/subscriptions/rls/lists/nominal/presence/initial_notify/test-config.yaml
M tests/channels/pjsip/subscriptions/rls/lists/nominal/presence/partial_state/test-config.yaml
M tests/channels/pjsip/subscriptions/rls/lists/nominal/presence/resubscribe_full_state/test-config.yaml
M tests/channels/pjsip/subscriptions/rls/lists/nominal/presence/termination_full_state/test-config.yaml
M tests/channels/pjsip/subscriptions/rls/lists/off_nominal/mwi/resource_duplication/test-config.yaml
M tests/channels/pjsip/subscriptions/rls/lists/off_nominal/mwi/some_list_resources_exist/test-config.yaml
M tests/channels/pjsip/subscriptions/rls/lists/off_nominal/presence/resource_duplication/test-config.yaml
M tests/channels/pjsip/subscriptions/rls/lists/off_nominal/presence/some_list_resources_exist/test-config.yaml
M tests/channels/pjsip/subscriptions/rls/lists_of_lists/nominal/mwi/batched/test-config.yaml
M tests/channels/pjsip/subscriptions/rls/lists_of_lists/nominal/mwi/full_state_alice/test-config.yaml
M tests/channels/pjsip/subscriptions/rls/lists_of_lists/nominal/mwi/full_state_carol/test-config.yaml
M tests/channels/pjsip/subscriptions/rls/lists_of_lists/nominal/mwi/initial_notify/test-config.yaml
M tests/channels/pjsip/subscriptions/rls/lists_of_lists/nominal/mwi/partial_state_alice/test-config.yaml
M tests/channels/pjsip/subscriptions/rls/lists_of_lists/nominal/mwi/partial_state_carol/test-config.yaml
M tests/channels/pjsip/subscriptions/rls/lists_of_lists/nominal/mwi/resubscribe_full_state/test-config.yaml
M tests/channels/pjsip/subscriptions/rls/lists_of_lists/nominal/mwi/termination_full_state/test-config.yaml
M tests/channels/pjsip/subscriptions/rls/lists_of_lists/nominal/presence/batched/test-config.yaml
M tests/channels/pjsip/subscriptions/rls/lists_of_lists/nominal/presence/full_state_alice/test-config.yaml
M tests/channels/pjsip/subscriptions/rls/lists_of_lists/nominal/presence/full_state_carol/test-config.yaml
M tests/channels/pjsip/subscriptions/rls/lists_of_lists/nominal/presence/initial_notify/test-config.yaml
M tests/channels/pjsip/subscriptions/rls/lists_of_lists/nominal/presence/listception_initial_notify/test-config.yaml
M tests/channels/pjsip/subscriptions/rls/lists_of_lists/nominal/presence/partial_state_alice/test-config.yaml
M tests/channels/pjsip/subscriptions/rls/lists_of_lists/nominal/presence/partial_state_carol/test-config.yaml
M tests/channels/pjsip/subscriptions/rls/lists_of_lists/nominal/presence/resubscribe_full_state/test-config.yaml
M tests/channels/pjsip/subscriptions/rls/lists_of_lists/nominal/presence/termination_full_state/test-config.yaml
M tests/channels/pjsip/subscriptions/rls/lists_of_lists/off_nominal/mwi/resource_duplication/test-config.yaml
M tests/channels/pjsip/subscriptions/rls/lists_of_lists/off_nominal/mwi/shared_name_w_list_support/test-config.yaml
M tests/channels/pjsip/subscriptions/rls/lists_of_lists/off_nominal/presence/resource_duplication/test-config.yaml
M tests/channels/pjsip/subscriptions/rls/lists_of_lists/off_nominal/presence/shared_name_w_list_support/test-config.yaml
M tests/channels/pjsip/subscriptions/rls/rls_test.py
46 files changed, 392 insertions(+), 509 deletions(-)

Approvals:
  Anonymous Coward #1000019: Verified
  Joshua Colp: Looks good to me, approved
  Corey Farrell: Looks good to me, but someone else must approve



diff --git a/tests/channels/pjsip/subscriptions/rls/lists/nominal/mwi/batched/basic/test-config.yaml b/tests/channels/pjsip/subscriptions/rls/lists/nominal/mwi/batched/basic/test-config.yaml
index 5376496..229da31 100644
--- a/tests/channels/pjsip/subscriptions/rls/lists/nominal/mwi/batched/basic/test-config.yaml
+++ b/tests/channels/pjsip/subscriptions/rls/lists/nominal/mwi/batched/basic/test-config.yaml
@@ -53,29 +53,20 @@
                 - { 'key-args': {'scenario': 'subscribe.xml', '-i': '127.0.0.1', '-p': '5061', '-s': 'mail_list'} }
 
 test-config:
-    list_name: 'mail_list'
-    resources:
+    list-name: 'mail_list'
+    packets:
         -
-            { 'alice': {'type': 'MWI', 'state': 'active', 'voice_message': '0/0 (0/0)', 'messages_waiting': 'no'},
-              'bob': {'type': 'MWI', 'state': 'active', 'voice_message': '0/0 (0/0)', 'messages_waiting': 'no'} }
+            full-state: True
+            resources: { 'alice': {'type': 'MWI', 'state': 'active', 'voice_message': '0/0 (0/0)', 'messages_waiting': 'no'}, 'bob': {'type': 'MWI', 'state': 'active', 'voice_message': '0/0 (0/0)', 'messages_waiting': 'no'} }
         -
-            { 'alice': {'type': 'MWI', 'state': 'active', 'voice_message': '1/0 (0/0)', 'messages_waiting': 'yes'}}
+            full-state: False
+            resources: { 'alice': {'type': 'MWI', 'state': 'active', 'voice_message': '1/0 (0/0)', 'messages_waiting': 'yes'} }
         -
-            { 'alice': {'type': 'MWI', 'state': 'active', 'voice_message': '1/0 (0/0)', 'messages_waiting': 'yes'},
-              'bob': {'type': 'MWI', 'state': 'active', 'voice_message': '0/0 (0/0)', 'messages_waiting': 'no'} }
+            full-state: True
+            resources: { 'alice': {'type': 'MWI', 'state': 'active', 'voice_message': '1/0 (0/0)', 'messages_waiting': 'yes'}, 'bob': {'type': 'MWI', 'state': 'active', 'voice_message': '0/0 (0/0)', 'messages_waiting': 'no'} }
         -
-            { 'bob': {'type': 'MWI', 'state': 'active', 'voice_message': '1/0 (0/0)', 'messages_waiting': 'yes'} }
+            full-state: False
+            resources: { 'bob': {'type': 'MWI', 'state': 'active', 'voice_message': '1/0 (0/0)', 'messages_waiting': 'yes'} }
         -
-            { 'alice': {'type': 'MWI', 'state': 'terminated', 'voice_message': '1/0 (0/0)', 'messages_waiting': 'yes'},
-              'bob': {'type': 'MWI', 'state': 'terminated', 'voice_message': '1/0 (0/0)', 'messages_waiting': 'yes'} }
-    full_state:
-        -
-            True
-        -
-            False
-        -
-            True
-        -
-            False
-        -
-            True
+            full-state: True
+            resources: { 'alice': {'type': 'MWI', 'state': 'terminated', 'voice_message': '1/0 (0/0)', 'messages_waiting': 'yes'}, 'bob': {'type': 'MWI', 'state': 'terminated', 'voice_message': '1/0 (0/0)', 'messages_waiting': 'yes'} }
diff --git a/tests/channels/pjsip/subscriptions/rls/lists/nominal/mwi/batched/multiple_resources_single_change/test-config.yaml b/tests/channels/pjsip/subscriptions/rls/lists/nominal/mwi/batched/multiple_resources_single_change/test-config.yaml
index 0fe179f..8bf223d 100644
--- a/tests/channels/pjsip/subscriptions/rls/lists/nominal/mwi/batched/multiple_resources_single_change/test-config.yaml
+++ b/tests/channels/pjsip/subscriptions/rls/lists/nominal/mwi/batched/multiple_resources_single_change/test-config.yaml
@@ -47,31 +47,20 @@
                 - { 'key-args': {'scenario': 'subscribe.xml', '-i': '127.0.0.1', '-p': '5061', '-s': 'mail_list'} }
 
 test-config:
-    list_name: 'mail_list'
-    resources:
+    list-name: 'mail_list'
+    packets:
         -
-            { 'alice': {'type': 'MWI', 'state': 'active', 'voice_message': '0/0 (0/0)', 'messages_waiting': 'no'},
-              'bob': {'type': 'MWI', 'state': 'active', 'voice_message': '0/0 (0/0)', 'messages_waiting': 'no'} }
+            full-state: True
+            resources: { 'alice': {'type': 'MWI', 'state': 'active', 'voice_message': '0/0 (0/0)', 'messages_waiting': 'no'}, 'bob': {'type': 'MWI', 'state': 'active', 'voice_message': '0/0 (0/0)', 'messages_waiting': 'no'} }
         -
-            { 'alice': {'type': 'MWI', 'state': 'active', 'voice_message': '1/0 (0/0)', 'messages_waiting': 'yes'},
-              'bob': {'type': 'MWI', 'state': 'active', 'voice_message': '1/0 (0/0)', 'messages_waiting': 'yes'} }
+            full-state: False
+            resources: { 'alice': {'type': 'MWI', 'state': 'active', 'voice_message': '1/0 (0/0)', 'messages_waiting': 'yes'}, 'bob': {'type': 'MWI', 'state': 'active', 'voice_message': '1/0 (0/0)', 'messages_waiting': 'yes'} }
         -
-            { 'alice': {'type': 'MWI', 'state': 'active', 'voice_message': '1/0 (0/0)', 'messages_waiting': 'yes'},
-              'bob': {'type': 'MWI', 'state': 'active', 'voice_message': '1/0 (0/0)', 'messages_waiting': 'yes'} }
+            full-state: True
+            resources: { 'alice': {'type': 'MWI', 'state': 'active', 'voice_message': '1/0 (0/0)', 'messages_waiting': 'yes'}, 'bob': {'type': 'MWI', 'state': 'active', 'voice_message': '1/0 (0/0)', 'messages_waiting': 'yes'} }
         -
-            { 'alice': {'type': 'MWI', 'state': 'active', 'voice_message': '2/0 (0/0)', 'messages_waiting': 'yes'},
-              'bob': {'type': 'MWI', 'state': 'active', 'voice_message': '2/0 (0/0)', 'messages_waiting': 'yes'} }
+            full-state: False
+            resources: { 'alice': {'type': 'MWI', 'state': 'active', 'voice_message': '2/0 (0/0)', 'messages_waiting': 'yes'}, 'bob': {'type': 'MWI', 'state': 'active', 'voice_message': '2/0 (0/0)', 'messages_waiting': 'yes'} }
         -
-            { 'alice': {'type': 'MWI', 'state': 'terminated', 'voice_message': '2/0 (0/0)', 'messages_waiting': 'yes'},
-              'bob': {'type': 'MWI', 'state': 'terminated', 'voice_message': '2/0 (0/0)', 'messages_waiting': 'yes'} }
-    full_state:
-        -
-            True
-        -
-            False
-        -
-            True
-        -
-            False
-        -
-            True
+            full-state: True
+            resources: { 'alice': {'type': 'MWI', 'state': 'terminated', 'voice_message': '2/0 (0/0)', 'messages_waiting': 'yes'}, 'bob': {'type': 'MWI', 'state': 'terminated', 'voice_message': '2/0 (0/0)', 'messages_waiting': 'yes'} }
diff --git a/tests/channels/pjsip/subscriptions/rls/lists/nominal/mwi/batched/resubscription_interruption/test-config.yaml b/tests/channels/pjsip/subscriptions/rls/lists/nominal/mwi/batched/resubscription_interruption/test-config.yaml
index 8739cd3..d50dc4a 100644
--- a/tests/channels/pjsip/subscriptions/rls/lists/nominal/mwi/batched/resubscription_interruption/test-config.yaml
+++ b/tests/channels/pjsip/subscriptions/rls/lists/nominal/mwi/batched/resubscription_interruption/test-config.yaml
@@ -49,17 +49,12 @@
                 - { 'key-args': {'scenario': 'subscribe.xml', '-i': '127.0.0.1', '-p': '5061', '-s': 'mail_list', '-d': '3000'} }
 
 test-config:
-    stop_after_notifys: False
-    list_name: 'mail_list'
-    resources:
+    stop-test-after-notifys: False
+    list-name 'mail_list'
+    packets:
         -
-            { 'alice': {'type': 'MWI', 'state': 'active', 'voice_message': '0/0 (0/0)', 'messages_waiting': 'no'},
-              'bob': {'type': 'MWI', 'state': 'active', 'voice_message': '0/0 (0/0)', 'messages_waiting': 'no'} }
+            full-state: True
+            resources: { 'alice': {'type': 'MWI', 'state': 'active', 'voice_message': '0/0 (0/0)', 'messages_waiting': 'no'}, 'bob': {'type': 'MWI', 'state': 'active', 'voice_message': '0/0 (0/0)', 'messages_waiting': 'no'} }
         -
-            { 'alice': {'type': 'MWI', 'state': 'active', 'voice_message': '1/0 (0/0)', 'messages_waiting': 'yes'},
-              'bob': {'type': 'MWI', 'state': 'active', 'voice_message': '0/0 (0/0)', 'messages_waiting': 'no'} }
-    full_state:
-        -
-            True
-        -
-            True
+            full-state: True
+            resources: { 'alice': {'type': 'MWI', 'state': 'active', 'voice_message': '1/0 (0/0)', 'messages_waiting': 'yes'}, 'bob': {'type': 'MWI', 'state': 'active', 'voice_message': '0/0 (0/0)', 'messages_waiting': 'no'} }
diff --git a/tests/channels/pjsip/subscriptions/rls/lists/nominal/mwi/batched/single_resource_multiple_changes/test-config.yaml b/tests/channels/pjsip/subscriptions/rls/lists/nominal/mwi/batched/single_resource_multiple_changes/test-config.yaml
index 6739142..e5bc39e 100644
--- a/tests/channels/pjsip/subscriptions/rls/lists/nominal/mwi/batched/single_resource_multiple_changes/test-config.yaml
+++ b/tests/channels/pjsip/subscriptions/rls/lists/nominal/mwi/batched/single_resource_multiple_changes/test-config.yaml
@@ -47,29 +47,69 @@
                 - { 'key-args': {'scenario': 'subscribe.xml', '-i': '127.0.0.1', '-p': '5061', '-s': 'mail_list'} }
 
 test-config:
-    list_name: 'mail_list'
-    resources:
+    list-name: 'mail_list'
+    packets:
         -
-            { 'alice': {'type': 'MWI', 'state': 'active', 'voice_message': '0/0 (0/0)', 'messages_waiting': 'no'},
-              'bob': {'type': 'MWI', 'state': 'active', 'voice_message': '0/0 (0/0)', 'messages_waiting': 'no'} }
+            full-state: True
+            resources: {
+                'alice': {
+                    'type': 'MWI',
+                    'state': 'active',
+                    'voice_message': '0/0 (0/0)',
+                    'messages_waiting': 'no'},
+                    'bob': {'type': 'MWI',
+                    'state': 'active',
+                    'voice_message': '0/0 (0/0)',
+                    'messages_waiting': 'no'
+                    }
+                }
         -
-            { 'alice': {'type': 'MWI', 'state': 'active', 'voice_message': '2/0 (0/0)', 'messages_waiting': 'yes'}}
+            full-state: False
+            resources: {
+                    'alice': {
+                    'type': 'MWI',
+                    'state': 'active',
+                    'voice_message': '2/0 (0/0)',
+                    'messages_waiting': 'yes'
+                    }
+                }
         -
-            { 'alice': {'type': 'MWI', 'state': 'active', 'voice_message': '2/0 (0/0)', 'messages_waiting': 'yes'},
-              'bob': {'type': 'MWI', 'state': 'active', 'voice_message': '0/0 (0/0)', 'messages_waiting': 'no'} }
+            full-state: True
+            resources: {
+                    'alice': {
+                    'type': 'MWI',
+                    'state': 'active',
+                    'voice_message': '2/0 (0/0)',
+                    'messages_waiting': 'yes'},
+                    'bob': {
+                    'type': 'MWI',
+                    'state': 'active',
+                    'voice_message': '0/0 (0/0)',
+                    'messages_waiting': 'no'
+                    }
+                }
         -
-            { 'bob': {'type': 'MWI', 'state': 'active', 'voice_message': '2/0 (0/0)', 'messages_waiting': 'yes'} }
+            full-state: False
+            resources: {
+                    'bob': {
+                    'type': 'MWI',
+                    'state': 'active',
+                    'voice_message': '2/0 (0/0)',
+                    'messages_waiting': 'yes'
+                    }
+                }
         -
-            { 'alice': {'type': 'MWI', 'state': 'terminated', 'voice_message': '2/0 (0/0)', 'messages_waiting': 'yes'},
-              'bob': {'type': 'MWI', 'state': 'terminated', 'voice_message': '2/0 (0/0)', 'messages_waiting': 'yes'} }
-    full_state:
-        -
-            True
-        -
-            False
-        -
-            True
-        -
-            False
-        -
-            True
+            full-state: True
+            resources: {
+                    'alice': {
+                    'type': 'MWI',
+                    'state': 'terminated',
+                    'voice_message': '2/0 (0/0)',
+                    'messages_waiting': 'yes'},
+                    'bob': {
+                    'type': 'MWI',
+                    'state': 'terminated',
+                    'voice_message': '2/0 (0/0)',
+                    'messages_waiting': 'yes'
+                    }
+                }
diff --git a/tests/channels/pjsip/subscriptions/rls/lists/nominal/mwi/batched/termination_interruption/test-config.yaml b/tests/channels/pjsip/subscriptions/rls/lists/nominal/mwi/batched/termination_interruption/test-config.yaml
index 331213b..1ec8217 100644
--- a/tests/channels/pjsip/subscriptions/rls/lists/nominal/mwi/batched/termination_interruption/test-config.yaml
+++ b/tests/channels/pjsip/subscriptions/rls/lists/nominal/mwi/batched/termination_interruption/test-config.yaml
@@ -49,17 +49,12 @@
                 - { 'key-args': {'scenario': 'subscribe.xml', '-i': '127.0.0.1', '-p': '5061', '-s': 'mail_list', '-d': '3000'} }
 
 test-config:
-    stop_after_notifys: False
-    list_name: 'mail_list'
-    resources:
+    stop-test-after-notifys: False
+    list-name 'mail_list'
+    packets:
         -
-            { 'alice': {'type': 'MWI', 'state': 'active', 'voice_message': '0/0 (0/0)', 'messages_waiting': 'no'},
-              'bob': {'type': 'MWI', 'state': 'active', 'voice_message': '0/0 (0/0)', 'messages_waiting': 'no'} }
+            full-state: True
+            resources: { 'alice': {'type': 'MWI', 'state': 'active', 'voice_message': '0/0 (0/0)', 'messages_waiting': 'no'}, 'bob': {'type': 'MWI', 'state': 'active', 'voice_message': '0/0 (0/0)', 'messages_waiting': 'no'} }
         -
-            { 'alice': {'type': 'MWI', 'state': 'terminated', 'voice_message': '1/0 (0/0)', 'messages_waiting': 'yes'},
-              'bob': {'type': 'MWI', 'state': 'terminated', 'voice_message': '0/0 (0/0)', 'messages_waiting': 'no'} }
-    full_state:
-        -
-            True
-        -
-            True
+            full-state: True
+            resources: { 'alice': {'type': 'MWI', 'state': 'terminated', 'voice_message': '1/0 (0/0)', 'messages_waiting': 'yes'}, 'bob': {'type': 'MWI', 'state': 'terminated', 'voice_message': '0/0 (0/0)', 'messages_waiting': 'no'} }
diff --git a/tests/channels/pjsip/subscriptions/rls/lists/nominal/mwi/full_state/test-config.yaml b/tests/channels/pjsip/subscriptions/rls/lists/nominal/mwi/full_state/test-config.yaml
index 27b0a10..5425313 100644
--- a/tests/channels/pjsip/subscriptions/rls/lists/nominal/mwi/full_state/test-config.yaml
+++ b/tests/channels/pjsip/subscriptions/rls/lists/nominal/mwi/full_state/test-config.yaml
@@ -44,19 +44,14 @@
                 - { 'key-args': {'scenario': 'list_subscribe.xml', '-i': '127.0.0.1', '-p': '5061', '-s': 'mail_list'} }
 
 test-config:
-    list_name: 'mail_list'
-    resources:
+    list-name: 'mail_list'
+    packets:
         -
-            { 'alice': {'type': 'MWI', 'state': 'active', 'voice_message': '0/0 (0/0)', 'messages_waiting': 'no'},
-              'bob': {'type': 'MWI', 'state': 'active', 'voice_message': '0/0 (0/0)', 'messages_waiting': 'no'} }
+            full-state: True
+            resources: { 'alice': {'type': 'MWI', 'state': 'active', 'voice_message': '0/0 (0/0)', 'messages_waiting': 'no'}, 'bob': {'type': 'MWI', 'state': 'active', 'voice_message': '0/0 (0/0)', 'messages_waiting': 'no'} }
         -
-            { 'alice': {'type': 'MWI', 'state': 'active', 'voice_message': '1/2 (0/0)', 'messages_waiting': 'yes'},
-              'bob': {'type': 'MWI', 'state': 'active', 'voice_message': '0/0 (0/0)', 'messages_waiting': 'no'} }
-    full_state:
-        -
-            True
-        -
-            True
-    ami_action:
+            full-state: True
+            resources: { 'alice': {'type': 'MWI', 'state': 'active', 'voice_message': '1/2 (0/0)', 'messages_waiting': 'yes'}, 'bob': {'type': 'MWI', 'state': 'active', 'voice_message': '0/0 (0/0)', 'messages_waiting': 'no'} }
+    ami-action:
         -
             { 'action': 'MWIUpdate', 'Mailbox': 'alice at default', 'NewMessages': '1', 'OldMessages': '2' }
diff --git a/tests/channels/pjsip/subscriptions/rls/lists/nominal/mwi/initial_notify/test-config.yaml b/tests/channels/pjsip/subscriptions/rls/lists/nominal/mwi/initial_notify/test-config.yaml
index 0db7841..5a2354b 100644
--- a/tests/channels/pjsip/subscriptions/rls/lists/nominal/mwi/initial_notify/test-config.yaml
+++ b/tests/channels/pjsip/subscriptions/rls/lists/nominal/mwi/initial_notify/test-config.yaml
@@ -57,11 +57,8 @@
                 - { 'key-args': {'scenario': 'list_subscribe.xml', '-i': '127.0.0.1', '-p': '5061', '-s': 'mail_list'} }
 
 test-config:
-    list_name: 'mail_list'
-    resources:
+    list-name: 'mail_list'
+    packets:
         -
-            { 'alice': {'type': 'MWI', 'state': 'active', 'voice_message': '0/0 (0/0)', 'messages_waiting': 'no'},
-              'bob': {'type': 'MWI', 'state': 'active', 'voice_message': '0/0 (0/0)', 'messages_waiting': 'no'} }
-    full_state:
-        -
-            True
+            full-state: True
+            resources: { 'alice': {'type': 'MWI', 'state': 'active', 'voice_message': '0/0 (0/0)', 'messages_waiting': 'no'}, 'bob': {'type': 'MWI', 'state': 'active', 'voice_message': '0/0 (0/0)', 'messages_waiting': 'no'} }
diff --git a/tests/channels/pjsip/subscriptions/rls/lists/nominal/mwi/partial_state/test-config.yaml b/tests/channels/pjsip/subscriptions/rls/lists/nominal/mwi/partial_state/test-config.yaml
index 9afb9b0..0cac3c3 100644
--- a/tests/channels/pjsip/subscriptions/rls/lists/nominal/mwi/partial_state/test-config.yaml
+++ b/tests/channels/pjsip/subscriptions/rls/lists/nominal/mwi/partial_state/test-config.yaml
@@ -44,18 +44,34 @@
                 - { 'key-args': {'scenario': 'list_subscribe.xml', '-i': '127.0.0.1', '-p': '5061', '-s': 'mail_list'} }
 
 test-config:
-    list_name: 'mail_list'
-    resources:
+    list-name: 'mail_list'
+    packets:
         -
-            { 'alice': {'type': 'MWI', 'state': 'active', 'voice_message': '0/0 (0/0)', 'messages_waiting': 'no'},
-              'bob': {'type': 'MWI', 'state': 'active', 'voice_message': '0/0 (0/0)', 'messages_waiting': 'no'} }
+            full-state: True
+            resources: {
+                'alice': {
+                    'type': 'MWI',
+                    'state': 'active',
+                    'voice_message': '0/0 (0/0)',
+                    'messages_waiting': 'no'
+                    },
+                'bob': {
+                    'type': 'MWI',
+                    'state': 'active',
+                    'voice_message': '0/0 (0/0)',
+                    'messages_waiting': 'no'
+                }
+            }
         -
-            { 'alice': {'type': 'MWI', 'state': 'active', 'voice_message': '1/2 (0/0)', 'messages_waiting': 'yes'} }
-    full_state:
-        -
-            True
-        -
-            False
-    ami_action:
+            full-state: False
+            resources: {
+                'alice': {
+                    'type': 'MWI',
+                    'state': 'active',
+                    'voice_message': '1/2 (0/0)',
+                    'messages_waiting': 'yes'
+                }
+            }
+    ami-action:
         -
             { 'action': 'MWIUpdate', 'Mailbox': 'alice at default', 'NewMessages': '1', 'OldMessages': '2' }
diff --git a/tests/channels/pjsip/subscriptions/rls/lists/nominal/mwi/resubscribe_full_state/test-config.yaml b/tests/channels/pjsip/subscriptions/rls/lists/nominal/mwi/resubscribe_full_state/test-config.yaml
index 0640d21..ba52c53 100644
--- a/tests/channels/pjsip/subscriptions/rls/lists/nominal/mwi/resubscribe_full_state/test-config.yaml
+++ b/tests/channels/pjsip/subscriptions/rls/lists/nominal/mwi/resubscribe_full_state/test-config.yaml
@@ -44,16 +44,11 @@
                 - { 'key-args': {'scenario': 'resubscribe.xml', '-i': '127.0.0.1', '-p': '5061', '-s': 'mail_list'} }
 
 test-config:
-    list_name: 'mail_list'
-    resources:
+    list-name: 'mail_list'
+    packets:
         -
-            { 'alice': {'type': 'MWI', 'state': 'active', 'voice_message': '0/0 (0/0)', 'messages_waiting': 'no'},
-              'bob': {'type': 'MWI', 'state': 'active', 'voice_message': '0/0 (0/0)', 'messages_waiting': 'no'} }
+            full-state: True
+            resources: { 'alice': {'type': 'MWI', 'state': 'active', 'voice_message': '0/0 (0/0)', 'messages_waiting': 'no'}, 'bob': {'type': 'MWI', 'state': 'active', 'voice_message': '0/0 (0/0)', 'messages_waiting': 'no'} }
         -
-            { 'alice': {'type': 'MWI', 'state': 'active', 'voice_message': '0/0 (0/0)', 'messages_waiting': 'no'},
-              'bob': {'type': 'MWI', 'state': 'active', 'voice_message': '0/0 (0/0)', 'messages_waiting': 'no'} }
-    full_state:
-        -
-            True
-        -
-            True
+            full-state: True
+            resources: { 'alice': {'type': 'MWI', 'state': 'active', 'voice_message': '0/0 (0/0)', 'messages_waiting': 'no'}, 'bob': {'type': 'MWI', 'state': 'active', 'voice_message': '0/0 (0/0)', 'messages_waiting': 'no'} }
diff --git a/tests/channels/pjsip/subscriptions/rls/lists/nominal/mwi/termination_full_state/test-config.yaml b/tests/channels/pjsip/subscriptions/rls/lists/nominal/mwi/termination_full_state/test-config.yaml
index 55fff97..45875d3 100644
--- a/tests/channels/pjsip/subscriptions/rls/lists/nominal/mwi/termination_full_state/test-config.yaml
+++ b/tests/channels/pjsip/subscriptions/rls/lists/nominal/mwi/termination_full_state/test-config.yaml
@@ -45,16 +45,11 @@
                 - { 'key-args': {'scenario': 'termination.xml', '-i': '127.0.0.1', '-p': '5061', '-s': 'mail_list'} }
 
 test-config:
-    list_name: 'mail_list'
-    resources:
+    list-name: 'mail_list'
+    packets:
         -
-            { 'alice': {'type': 'MWI', 'state': 'active', 'voice_message': '0/0 (0/0)', 'messages_waiting': 'no'},
-              'bob': {'type': 'MWI', 'state': 'active', 'voice_message': '0/0 (0/0)', 'messages_waiting': 'no'} }
+            full-state: True
+            resources: { 'alice': {'type': 'MWI', 'state': 'active', 'voice_message': '0/0 (0/0)', 'messages_waiting': 'no'}, 'bob': {'type': 'MWI', 'state': 'active', 'voice_message': '0/0 (0/0)', 'messages_waiting': 'no'} }
         -
-            { 'alice': {'type': 'MWI', 'state': 'terminated', 'voice_message': '0/0 (0/0)', 'messages_waiting': 'no'},
-              'bob': {'type': 'MWI', 'state': 'terminated', 'voice_message': '0/0 (0/0)', 'messages_waiting': 'no'} }
-    full_state:
-        -
-            True
-        -
-            True
+            full-state: True
+            resources: { 'alice': {'type': 'MWI', 'state': 'terminated', 'voice_message': '0/0 (0/0)', 'messages_waiting': 'no'}, 'bob': {'type': 'MWI', 'state': 'terminated', 'voice_message': '0/0 (0/0)', 'messages_waiting': 'no'} }
diff --git a/tests/channels/pjsip/subscriptions/rls/lists/nominal/presence/batched/basic/test-config.yaml b/tests/channels/pjsip/subscriptions/rls/lists/nominal/presence/batched/basic/test-config.yaml
index c2a2f08..fafac44 100644
--- a/tests/channels/pjsip/subscriptions/rls/lists/nominal/presence/batched/basic/test-config.yaml
+++ b/tests/channels/pjsip/subscriptions/rls/lists/nominal/presence/batched/basic/test-config.yaml
@@ -51,30 +51,24 @@
                 - { 'key-args': {'scenario': 'subscribe.xml', '-i': '127.0.0.1', '-p': '5061', '-s': 'pres_list'} }
 
 test-config:
-    stop_test_notifys: False
-    list_name: 'pres_list'
-    resources:
+    stop-test-after-notifys: False
+    list-name: 'pres_list'
+    packets:
         -
-            { 'alice': {'type': 'PIDF', 'state': 'active'},
+            full-state: True
+            resources: { 'alice': {'type': 'PIDF', 'state': 'active'},
               'bob': {'type': 'PIDF', 'state': 'active'}}
         -
-            { 'alice': {'type': 'PIDF', 'state': 'active'}}
+            full-state: False
+            resources: { 'alice': {'type': 'PIDF', 'state': 'active'}}
         -
-            { 'alice': {'type': 'PIDF', 'state': 'active'},
+            full-state: True
+            resources: { 'alice': {'type': 'PIDF', 'state': 'active'},
               'bob': {'type': 'PIDF', 'state': 'active'}}
         -
-            { 'bob': {'type': 'PIDF', 'state': 'active'}}
+            full-state: False
+            resources: { 'bob': {'type': 'PIDF', 'state': 'active'}}
         -
-            { 'alice': {'type': 'PIDF', 'state': 'terminated'},
+            full-state: True
+            resources: { 'alice': {'type': 'PIDF', 'state': 'terminated'},
               'bob': {'type': 'PIDF', 'state': 'terminated'}}
-    full_state:
-        -
-            True
-        -
-            False
-        -
-            True
-        -
-            False
-        -
-            True
diff --git a/tests/channels/pjsip/subscriptions/rls/lists/nominal/presence/batched/multiple_resources_single_change/test-config.yaml b/tests/channels/pjsip/subscriptions/rls/lists/nominal/presence/batched/multiple_resources_single_change/test-config.yaml
index 3bfad9c..e978669 100644
--- a/tests/channels/pjsip/subscriptions/rls/lists/nominal/presence/batched/multiple_resources_single_change/test-config.yaml
+++ b/tests/channels/pjsip/subscriptions/rls/lists/nominal/presence/batched/multiple_resources_single_change/test-config.yaml
@@ -43,31 +43,20 @@
                 - { 'key-args': {'scenario': 'subscribe.xml', '-i': '127.0.0.1', '-p': '5061', '-s': 'pres_list'} }
 
 test-config:
-    list_name: 'pres_list'
-    resources:
+    list-name: 'pres_list'
+    packets:
         -
-            { 'alice': {'type': 'PIDF', 'state': 'active'},
-              'bob': {'type': 'PIDF', 'state': 'active'}}
+            full-state: True
+            resources: { 'alice': {'type': 'PIDF', 'state': 'active'}, 'bob': {'type': 'PIDF', 'state': 'active'}}
         -
-            { 'alice': {'type': 'PIDF', 'state': 'active'},
-              'bob': {'type': 'PIDF', 'state': 'active'}}
+            full-state: False
+            resources: { 'alice': {'type': 'PIDF', 'state': 'active'}, 'bob': {'type': 'PIDF', 'state': 'active'}}
         -
-            { 'alice': {'type': 'PIDF', 'state': 'active'},
-              'bob': {'type': 'PIDF', 'state': 'active'}}
+            full-state: True
+            resources: { 'alice': {'type': 'PIDF', 'state': 'active'}, 'bob': {'type': 'PIDF', 'state': 'active'}}
         -
-            { 'alice': {'type': 'PIDF', 'state': 'active'},
-              'bob': {'type': 'PIDF', 'state': 'active'}}
+            full-state: False
+            resources: { 'alice': {'type': 'PIDF', 'state': 'active'}, 'bob': {'type': 'PIDF', 'state': 'active'}}
         -
-            { 'alice': {'type': 'PIDF', 'state': 'terminated'},
-              'bob': {'type': 'PIDF', 'state': 'terminated'}}
-    full_state:
-        -
-            True
-        -
-            False
-        -
-            True
-        -
-            False
-        -
-            True
+            full-state: True
+            resources: { 'alice': {'type': 'PIDF', 'state': 'terminated'}, 'bob': {'type': 'PIDF', 'state': 'terminated'}}
diff --git a/tests/channels/pjsip/subscriptions/rls/lists/nominal/presence/batched/resubscription_interruption/test-config.yaml b/tests/channels/pjsip/subscriptions/rls/lists/nominal/presence/batched/resubscription_interruption/test-config.yaml
index cb7fe3c..9044540 100644
--- a/tests/channels/pjsip/subscriptions/rls/lists/nominal/presence/batched/resubscription_interruption/test-config.yaml
+++ b/tests/channels/pjsip/subscriptions/rls/lists/nominal/presence/batched/resubscription_interruption/test-config.yaml
@@ -45,17 +45,12 @@
                 - { 'key-args': {'scenario': 'subscribe.xml', '-i': '127.0.0.1', '-p': '5061', '-s': 'pres_list', '-d': '3000'} }
 
 test-config:
-    stop_after_notifys: False
-    list_name: 'pres_list'
-    resources:
+    stop-test-after-notifys: False
+    list-name 'pres_list'
+    packets:
         -
-            { 'alice': {'type': 'PIDF', 'state': 'active'},
-              'bob': {'type': 'PIDF', 'state': 'active'}}
+            full-state: True
+            resources: { 'alice': {'type': 'PIDF', 'state': 'active'}, 'bob': {'type': 'PIDF', 'state': 'active'}}
         -
-            { 'alice': {'type': 'PIDF', 'state': 'active'},
-              'bob': {'type': 'PIDF', 'state': 'active'}}
-    full_state:
-        -
-            True
-        -
-            True
+            full-state: True
+            resources: { 'alice': {'type': 'PIDF', 'state': 'active'}, 'bob': {'type': 'PIDF', 'state': 'active'}}
diff --git a/tests/channels/pjsip/subscriptions/rls/lists/nominal/presence/batched/single_resource_multiple_changes/test-config.yaml b/tests/channels/pjsip/subscriptions/rls/lists/nominal/presence/batched/single_resource_multiple_changes/test-config.yaml
index 7a20ff8..ba63fb4 100644
--- a/tests/channels/pjsip/subscriptions/rls/lists/nominal/presence/batched/single_resource_multiple_changes/test-config.yaml
+++ b/tests/channels/pjsip/subscriptions/rls/lists/nominal/presence/batched/single_resource_multiple_changes/test-config.yaml
@@ -43,29 +43,20 @@
                 - { 'key-args': {'scenario': 'subscribe.xml', '-i': '127.0.0.1', '-p': '5061', '-s': 'pres_list'} }
 
 test-config:
-    list_name: 'pres_list'
-    resources:
+    list-name: 'pres_list'
+    packets:
         -
-            { 'alice': {'type': 'PIDF', 'state': 'active'},
-              'bob': {'type': 'PIDF', 'state': 'active'}}
+            full-state: True
+            resources: { 'alice': {'type': 'PIDF', 'state': 'active'}, 'bob': {'type': 'PIDF', 'state': 'active'}}
         -
-            { 'alice': {'type': 'PIDF', 'state': 'active'}}
+            full-state: False
+            resources: { 'alice': {'type': 'PIDF', 'state': 'active' } }
         -
-            { 'alice': {'type': 'PIDF', 'state': 'active'},
-              'bob': {'type': 'PIDF', 'state': 'active'}}
+            full-state: True
+            resources: { 'alice': {'type': 'PIDF', 'state': 'active'}, 'bob': {'type': 'PIDF', 'state': 'active'}}
         -
-            { 'bob': {'type': 'PIDF', 'state': 'active'}}
+            full-state: False
+            resources: { 'bob': {'type': 'PIDF', 'state': 'active' } }
         -
-            { 'alice': {'type': 'PIDF', 'state': 'terminated'},
-              'bob': {'type': 'PIDF', 'state': 'terminated'}}
-    full_state:
-        -
-            True
-        -
-            False
-        -
-            True
-        -
-            False
-        -
-            True
+            full-state: True
+            resources: { 'alice': {'type': 'PIDF', 'state': 'terminated'}, 'bob': {'type': 'PIDF', 'state': 'terminated'}}
diff --git a/tests/channels/pjsip/subscriptions/rls/lists/nominal/presence/batched/termination_interruption/test-config.yaml b/tests/channels/pjsip/subscriptions/rls/lists/nominal/presence/batched/termination_interruption/test-config.yaml
index a8d1886..5ff90ec 100644
--- a/tests/channels/pjsip/subscriptions/rls/lists/nominal/presence/batched/termination_interruption/test-config.yaml
+++ b/tests/channels/pjsip/subscriptions/rls/lists/nominal/presence/batched/termination_interruption/test-config.yaml
@@ -45,17 +45,12 @@
                 - { 'key-args': {'scenario': 'subscribe.xml', '-i': '127.0.0.1', '-p': '5061', '-s': 'pres_list', '-d': '3000'} }
 
 test-config:
-    stop_after_notifys: False
-    list_name: 'pres_list'
-    resources:
+    stop-test-after-notifys: False
+    list-name 'pres_list'
+    packets:
         -
-            { 'alice': {'type': 'PIDF', 'state': 'active'},
-              'bob': {'type': 'PIDF', 'state': 'active'}}
+            full-state: True
+            resources: { 'alice': {'type': 'PIDF', 'state': 'active'}, 'bob': {'type': 'PIDF', 'state': 'active'}}
         -
-            { 'alice': {'type': 'PIDF', 'state': 'terminated'},
-              'bob': {'type': 'PIDF', 'state': 'terminated'}}
-    full_state:
-        -
-            True
-        -
-            True
+            full-state: True
+            resources: { 'alice': {'type': 'PIDF', 'state': 'terminated'}, 'bob': {'type': 'PIDF', 'state': 'terminated'}}
diff --git a/tests/channels/pjsip/subscriptions/rls/lists/nominal/presence/full_state/test-config.yaml b/tests/channels/pjsip/subscriptions/rls/lists/nominal/presence/full_state/test-config.yaml
index 752653b..541e33f 100644
--- a/tests/channels/pjsip/subscriptions/rls/lists/nominal/presence/full_state/test-config.yaml
+++ b/tests/channels/pjsip/subscriptions/rls/lists/nominal/presence/full_state/test-config.yaml
@@ -41,19 +41,14 @@
                 - { 'key-args': {'scenario': 'list_subscribe.xml', '-i': '127.0.0.1', '-p': '5061', '-s': 'pres_list'} }
 
 test-config:
-    list_name: 'pres_list'
-    resources:
+    list-name: 'pres_list'
+    packets:
         -
-            { 'alice': {'type': 'PIDF', 'state': 'active'},
-              'bob': {'type': 'PIDF', 'state': 'active'} }
+            full-state: True
+            resources: { 'alice': {'type': 'PIDF', 'state': 'active'}, 'bob': {'type': 'PIDF', 'state': 'active'} }
         -
-            { 'alice': {'type': 'PIDF', 'state': 'active'},
-              'bob': {'type': 'PIDF', 'state': 'active'} }
-    full_state:
-        -
-            True
-        -
-            True
-    ami_action:
+            full-state: True
+            resources: { 'alice': {'type': 'PIDF', 'state': 'active'}, 'bob': {'type': 'PIDF', 'state': 'active'} }
+    ami-action:
         -
             { 'Action': 'SetVar', 'Variable': 'DEVICE_STATE(Custom:alice)', 'Value': 'INUSE' }
diff --git a/tests/channels/pjsip/subscriptions/rls/lists/nominal/presence/initial_notify/test-config.yaml b/tests/channels/pjsip/subscriptions/rls/lists/nominal/presence/initial_notify/test-config.yaml
index b876ed0..10a9ff4 100644
--- a/tests/channels/pjsip/subscriptions/rls/lists/nominal/presence/initial_notify/test-config.yaml
+++ b/tests/channels/pjsip/subscriptions/rls/lists/nominal/presence/initial_notify/test-config.yaml
@@ -54,11 +54,8 @@
                 - { 'key-args': {'scenario': 'list_subscribe.xml', '-i': '127.0.0.1', '-p': '5061', '-s': 'pres_list'} }
 
 test-config:
-    list_name: 'pres_list'
-    resources:
+    list-name: 'pres_list'
+    packets:
         -
-            { 'alice': {'type': 'PIDF', 'state': 'active'},
-              'bob': {'type': 'PIDF', 'state': 'active'} }
-    full_state:
-        -
-            True
+            full-state: True
+            resources: { 'alice': {'type': 'PIDF', 'state': 'active'}, 'bob': {'type': 'PIDF', 'state': 'active'} }
diff --git a/tests/channels/pjsip/subscriptions/rls/lists/nominal/presence/partial_state/test-config.yaml b/tests/channels/pjsip/subscriptions/rls/lists/nominal/presence/partial_state/test-config.yaml
index ce225fc..c9989a4 100644
--- a/tests/channels/pjsip/subscriptions/rls/lists/nominal/presence/partial_state/test-config.yaml
+++ b/tests/channels/pjsip/subscriptions/rls/lists/nominal/presence/partial_state/test-config.yaml
@@ -42,18 +42,14 @@
                 - { 'key-args': {'scenario': 'list_subscribe.xml', '-i': '127.0.0.1', '-p': '5061', '-s': 'pres_list'} }
 
 test-config:
-    list_name: 'pres_list'
-    resources:
+    list-name: 'pres_list'
+    packets:
         -
-            { 'alice': {'type': 'PIDF', 'state': 'active'},
-              'bob': {'type': 'PIDF', 'state': 'active'} }
+            full-state: True
+            resources: { 'alice': {'type': 'PIDF', 'state': 'active'}, 'bob': {'type': 'PIDF', 'state': 'active'} }
         -
-            { 'alice': {'type': 'PIDF', 'state': 'active'} }
-    full_state:
-        -
-            True
-        -
-            False
-    ami_action:
+            full-state: False
+            resources: { 'alice': {'type': 'PIDF', 'state': 'active' } }
+    ami-action:
         -
             { 'Action': 'SetVar', 'Variable': 'DEVICE_STATE(Custom:alice)', 'Value': 'INUSE' }
diff --git a/tests/channels/pjsip/subscriptions/rls/lists/nominal/presence/resubscribe_full_state/test-config.yaml b/tests/channels/pjsip/subscriptions/rls/lists/nominal/presence/resubscribe_full_state/test-config.yaml
index 940030f..4010042 100644
--- a/tests/channels/pjsip/subscriptions/rls/lists/nominal/presence/resubscribe_full_state/test-config.yaml
+++ b/tests/channels/pjsip/subscriptions/rls/lists/nominal/presence/resubscribe_full_state/test-config.yaml
@@ -42,16 +42,11 @@
                 - { 'key-args': {'scenario': 'resubscribe.xml', '-i': '127.0.0.1', '-p': '5061', '-s': 'pres_list'} }
 
 test-config:
-    list_name: 'pres_list'
-    resources:
+    list-name: 'pres_list'
+    packets:
         -
-            { 'alice': {'type': 'PIDF', 'state': 'active'},
-              'bob': {'type': 'PIDF', 'state': 'active'} }
+            full-state: True
+            resources: { 'alice': {'type': 'PIDF', 'state': 'active'}, 'bob': {'type': 'PIDF', 'state': 'active'} }
         -
-            { 'alice': {'type': 'PIDF', 'state': 'active'},
-              'bob': {'type': 'PIDF', 'state': 'active'} }
-    full_state:
-        -
-            True
-        -
-            True
+            full-state: True
+            resources: { 'alice': {'type': 'PIDF', 'state': 'active'}, 'bob': {'type': 'PIDF', 'state': 'active'} }
diff --git a/tests/channels/pjsip/subscriptions/rls/lists/nominal/presence/termination_full_state/test-config.yaml b/tests/channels/pjsip/subscriptions/rls/lists/nominal/presence/termination_full_state/test-config.yaml
index 208fc8a..e824eee 100644
--- a/tests/channels/pjsip/subscriptions/rls/lists/nominal/presence/termination_full_state/test-config.yaml
+++ b/tests/channels/pjsip/subscriptions/rls/lists/nominal/presence/termination_full_state/test-config.yaml
@@ -43,16 +43,11 @@
                 - { 'key-args': {'scenario': 'termination.xml', '-i': '127.0.0.1', '-p': '5061', '-s': 'pres_list'} }
 
 test-config:
-    list_name: 'pres_list'
-    resources:
+    list-name: 'pres_list'
+    packets:
         -
-            { 'alice': {'type': 'PIDF', 'state': 'active'},
-              'bob': {'type': 'PIDF', 'state': 'active'} }
+            full-state: True
+            resources: { 'alice': {'type': 'PIDF', 'state': 'active'}, 'bob': {'type': 'PIDF', 'state': 'active'} }
         -
-            { 'alice': {'type': 'PIDF', 'state': 'terminated'},
-              'bob': {'type': 'PIDF', 'state': 'terminated'} }
-    full_state:
-        -
-            True
-        -
-            True
+            full-state: True
+            resources: { 'alice': {'type': 'PIDF', 'state': 'terminated'}, 'bob': {'type': 'PIDF', 'state': 'terminated'} }
diff --git a/tests/channels/pjsip/subscriptions/rls/lists/off_nominal/mwi/resource_duplication/test-config.yaml b/tests/channels/pjsip/subscriptions/rls/lists/off_nominal/mwi/resource_duplication/test-config.yaml
index 4562196..0f68b57 100644
--- a/tests/channels/pjsip/subscriptions/rls/lists/off_nominal/mwi/resource_duplication/test-config.yaml
+++ b/tests/channels/pjsip/subscriptions/rls/lists/off_nominal/mwi/resource_duplication/test-config.yaml
@@ -39,10 +39,8 @@
                 - { 'key-args': {'scenario': 'list_subscribe.xml', '-i': '127.0.0.1', '-p': '5061', '-s': 'mail_list'} }
 
 test-config:
-    list_name: 'mail_list'
-    resources:
+    list-name: 'mail_list'
+    packets:
         -
-            { 'alice': {'type': 'MWI', 'state': 'active', 'voice_message': '0/0 (0/0)', 'messages_waiting': 'no'}}
-    full_state:
-        -
-            True
+            full-state: True
+            resources: { 'alice': {'type': 'MWI', 'state': 'active', 'voice_message': '0/0 (0/0)', 'messages_waiting': 'no' } }
diff --git a/tests/channels/pjsip/subscriptions/rls/lists/off_nominal/mwi/some_list_resources_exist/test-config.yaml b/tests/channels/pjsip/subscriptions/rls/lists/off_nominal/mwi/some_list_resources_exist/test-config.yaml
index a68a6eb..17c4e95 100644
--- a/tests/channels/pjsip/subscriptions/rls/lists/off_nominal/mwi/some_list_resources_exist/test-config.yaml
+++ b/tests/channels/pjsip/subscriptions/rls/lists/off_nominal/mwi/some_list_resources_exist/test-config.yaml
@@ -40,10 +40,8 @@
                 - { 'key-args': {'scenario': 'list_subscribe.xml', '-i': '127.0.0.1', '-p': '5061', '-s': 'mail_list'} }
 
 test-config:
-    list_name: 'mail_list'
-    resources:
+    list-name: 'mail_list'
+    packets:
         -
-            { 'alice': {'type': 'MWI', 'state': 'active', 'voice_message': '0/0 (0/0)', 'messages_waiting': 'no'}}
-    full_state:
-        -
-            True
+            full-state: True
+            resources: { 'alice': {'type': 'MWI', 'state': 'active', 'voice_message': '0/0 (0/0)', 'messages_waiting': 'no' } }
diff --git a/tests/channels/pjsip/subscriptions/rls/lists/off_nominal/presence/resource_duplication/test-config.yaml b/tests/channels/pjsip/subscriptions/rls/lists/off_nominal/presence/resource_duplication/test-config.yaml
index 5f185c5..8e9035a 100644
--- a/tests/channels/pjsip/subscriptions/rls/lists/off_nominal/presence/resource_duplication/test-config.yaml
+++ b/tests/channels/pjsip/subscriptions/rls/lists/off_nominal/presence/resource_duplication/test-config.yaml
@@ -37,10 +37,8 @@
                 - { 'key-args': {'scenario': 'list_subscribe.xml', '-i': '127.0.0.1', '-p': '5061', '-s': 'pres_list'} }
 
 test-config:
-    list_name: 'pres_list'
-    resources:
+    list-name: 'pres_list'
+    packets:
         -
-            { 'alice': {'type': 'PIDF', 'state': 'active'} }
-    full_state:
-        -
-            True
+            full-state: True
+            resources: { 'alice': {'type': 'PIDF', 'state': 'active' } }
diff --git a/tests/channels/pjsip/subscriptions/rls/lists/off_nominal/presence/some_list_resources_exist/test-config.yaml b/tests/channels/pjsip/subscriptions/rls/lists/off_nominal/presence/some_list_resources_exist/test-config.yaml
index febf9e4..cf51b04 100644
--- a/tests/channels/pjsip/subscriptions/rls/lists/off_nominal/presence/some_list_resources_exist/test-config.yaml
+++ b/tests/channels/pjsip/subscriptions/rls/lists/off_nominal/presence/some_list_resources_exist/test-config.yaml
@@ -38,10 +38,8 @@
                 - { 'key-args': {'scenario': 'list_subscribe.xml', '-i': '127.0.0.1', '-p': '5061', '-s': 'pres_list'} }
 
 test-config:
-    list_name: 'pres_list'
-    resources:
+    list-name: 'pres_list'
+    packets:
         -
-            { 'bob': {'type': 'PIDF', 'state': 'active'} }
-    full_state:
-        -
-            True
+            full-state: True
+            resources: { 'bob': {'type': 'PIDF', 'state': 'active' } }
diff --git a/tests/channels/pjsip/subscriptions/rls/lists_of_lists/nominal/mwi/batched/test-config.yaml b/tests/channels/pjsip/subscriptions/rls/lists_of_lists/nominal/mwi/batched/test-config.yaml
index 9e0d9ed..149094a 100644
--- a/tests/channels/pjsip/subscriptions/rls/lists_of_lists/nominal/mwi/batched/test-config.yaml
+++ b/tests/channels/pjsip/subscriptions/rls/lists_of_lists/nominal/mwi/batched/test-config.yaml
@@ -48,10 +48,11 @@
                 - { 'key-args': {'scenario': 'subscribe.xml', '-i': '127.0.0.1', '-p': '5061', '-s': 'mail_list_a'} }
 
 test-config:
-    list_name: 'mail_list_a'
-    resources:
+    list-name: 'mail_list_a'
+    packets:
         -
-            {
+            full-state: True
+            resources: {
                 'mail_list_b': {
                     'type': 'Multipart', 'state': 'active', 'sublist': {
                         'alice': {'type': 'MWI', 'state': 'active', 'voice_message': '0/0 (0/0)', 'messages_waiting': 'no'},
@@ -60,7 +61,8 @@
                 }
             }
         -
-            {
+            full-state: False
+            resources: {
                 'mail_list_b': {
                     'type': 'Multipart', 'state': 'active', 'sublist': {
                         'alice': {'type': 'MWI', 'state': 'active', 'voice_message': '1/0 (0/0)', 'messages_waiting': 'yes'},
@@ -68,17 +70,11 @@
                 }
             }
         -
-            {
+            full-state: False
+            resources: {
                 'mail_list_b': {
                     'type': 'Multipart', 'state': 'active', 'sublist': {
                         'bob': {'type': 'MWI', 'state': 'active', 'voice_message': '1/0 (0/0)', 'messages_waiting': 'yes'}
                     }
                 }
             }
-    full_state:
-        -
-            True
-        -
-            False
-        -
-            False
diff --git a/tests/channels/pjsip/subscriptions/rls/lists_of_lists/nominal/mwi/full_state_alice/test-config.yaml b/tests/channels/pjsip/subscriptions/rls/lists_of_lists/nominal/mwi/full_state_alice/test-config.yaml
index da0f7cf..202320a 100644
--- a/tests/channels/pjsip/subscriptions/rls/lists_of_lists/nominal/mwi/full_state_alice/test-config.yaml
+++ b/tests/channels/pjsip/subscriptions/rls/lists_of_lists/nominal/mwi/full_state_alice/test-config.yaml
@@ -44,10 +44,11 @@
                 - { 'key-args': {'scenario': 'list_subscribe.xml', '-i': '127.0.0.1', '-p': '5061', '-s': 'mail_list'} }
 
 test-config:
-    list_name: 'mail_list'
-    resources:
+    list-name: 'mail_list'
+    packets:
         -
-            {
+            full-state: True
+            resources: {
                 'mail_sublist': {
                     'type': 'Multipart',
                     'state': 'active',
@@ -74,7 +75,8 @@
                 }
             }
         -
-            {
+            full-state: True
+            resources: {
                 'mail_sublist': {
                     'type': 'Multipart',
                     'state': 'active',
@@ -101,12 +103,6 @@
                 }
             }
 
-    full_state:
-        -
-            True
-        -
-            True
-
-    ami_action:
+    ami-action:
         -
             { 'action': 'MWIUpdate', 'Mailbox': 'alice at default', 'NewMessages': '1', 'OldMessages': '2' }
diff --git a/tests/channels/pjsip/subscriptions/rls/lists_of_lists/nominal/mwi/full_state_carol/test-config.yaml b/tests/channels/pjsip/subscriptions/rls/lists_of_lists/nominal/mwi/full_state_carol/test-config.yaml
index b17bbfb..ffcab9f 100644
--- a/tests/channels/pjsip/subscriptions/rls/lists_of_lists/nominal/mwi/full_state_carol/test-config.yaml
+++ b/tests/channels/pjsip/subscriptions/rls/lists_of_lists/nominal/mwi/full_state_carol/test-config.yaml
@@ -44,10 +44,11 @@
                 - { 'key-args': {'scenario': 'list_subscribe.xml', '-i': '127.0.0.1', '-p': '5061', '-s': 'mail_list'} }
 
 test-config:
-    list_name: 'mail_list'
-    resources:
+    list-name: 'mail_list'
+    packets:
         -
-            {
+            full-state: True
+            resources: {
                 'mail_sublist': {
                     'type': 'Multipart',
                     'state': 'active',
@@ -74,7 +75,8 @@
                 }
             }
         -
-            {
+            full-state: True
+            resources: {
                 'mail_sublist': {
                     'type': 'Multipart',
                     'state': 'active',
@@ -101,12 +103,6 @@
                 }
             }
 
-    full_state:
-        -
-            True
-        -
-            True
-
-    ami_action:
+    ami-action:
         -
             { 'action': 'MWIUpdate', 'Mailbox': 'carol at default', 'NewMessages': '1', 'OldMessages': '2' }
diff --git a/tests/channels/pjsip/subscriptions/rls/lists_of_lists/nominal/mwi/initial_notify/test-config.yaml b/tests/channels/pjsip/subscriptions/rls/lists_of_lists/nominal/mwi/initial_notify/test-config.yaml
index 695aea2..ccd2001 100644
--- a/tests/channels/pjsip/subscriptions/rls/lists_of_lists/nominal/mwi/initial_notify/test-config.yaml
+++ b/tests/channels/pjsip/subscriptions/rls/lists_of_lists/nominal/mwi/initial_notify/test-config.yaml
@@ -58,10 +58,11 @@
                 - { 'key-args': {'scenario': 'list_subscribe.xml', '-i': '127.0.0.1', '-p': '5061', '-s': 'mail_list'} }
 
 test-config:
-    list_name: 'mail_list'
-    resources:
+    list-name: 'mail_list'
+    packets:
         -
-            {
+            full-state: True
+            resources: {
                 'mail_sublist': {
                     'type': 'Multipart',
                     'state': 'active',
@@ -87,6 +88,3 @@
                     'messages_waiting': 'no'
                 }
             }
-    full_state:
-        -
-            True
diff --git a/tests/channels/pjsip/subscriptions/rls/lists_of_lists/nominal/mwi/partial_state_alice/test-config.yaml b/tests/channels/pjsip/subscriptions/rls/lists_of_lists/nominal/mwi/partial_state_alice/test-config.yaml
index d005d54..ec99e76 100644
--- a/tests/channels/pjsip/subscriptions/rls/lists_of_lists/nominal/mwi/partial_state_alice/test-config.yaml
+++ b/tests/channels/pjsip/subscriptions/rls/lists_of_lists/nominal/mwi/partial_state_alice/test-config.yaml
@@ -44,10 +44,11 @@
                 - { 'key-args': {'scenario': 'list_subscribe.xml', '-i': '127.0.0.1', '-p': '5061', '-s': 'mail_list'} }
 
 test-config:
-    list_name: 'mail_list'
-    resources:
+    list-name: 'mail_list'
+    packets:
         -
-            {
+            full-state: True
+            resources: {
                 'mail_sublist': {
                     'type': 'Multipart',
                     'state': 'active',
@@ -74,7 +75,8 @@
                 }
             }
         -
-            {
+            full-state: False
+            resources: {
                 'mail_sublist': {
                     'type': 'Multipart',
                     'state': 'active',
@@ -89,12 +91,6 @@
                 }
             }
 
-    full_state:
-        -
-            True
-        -
-            False
-
-    ami_action:
+    ami-action:
         -
             { 'action': 'MWIUpdate', 'Mailbox': 'alice at default', 'NewMessages': '1', 'OldMessages': '2' }
diff --git a/tests/channels/pjsip/subscriptions/rls/lists_of_lists/nominal/mwi/partial_state_carol/test-config.yaml b/tests/channels/pjsip/subscriptions/rls/lists_of_lists/nominal/mwi/partial_state_carol/test-config.yaml
index 32ac6bc..7111d97 100644
--- a/tests/channels/pjsip/subscriptions/rls/lists_of_lists/nominal/mwi/partial_state_carol/test-config.yaml
+++ b/tests/channels/pjsip/subscriptions/rls/lists_of_lists/nominal/mwi/partial_state_carol/test-config.yaml
@@ -44,10 +44,11 @@
                 - { 'key-args': {'scenario': 'list_subscribe.xml', '-i': '127.0.0.1', '-p': '5061', '-s': 'mail_list'} }
 
 test-config:
-    list_name: 'mail_list'
-    resources:
+    list-name: 'mail_list'
+    packets:
         -
-            {
+            full-state: True
+            resources: {
                 'mail_sublist': {
                     'type': 'Multipart',
                     'state': 'active',
@@ -74,7 +75,8 @@
                 }
             }
         -
-            {
+            full-state: False
+            resources: {
                 'carol': {
                     'type': 'MWI',
                     'state': 'active',
@@ -83,12 +85,6 @@
                 }
             }
 
-    full_state:
-        -
-            True
-        -
-            False
-
-    ami_action:
+    ami-action:
         -
             { 'action': 'MWIUpdate', 'Mailbox': 'carol at default', 'NewMessages': '1', 'OldMessages': '2' }
diff --git a/tests/channels/pjsip/subscriptions/rls/lists_of_lists/nominal/mwi/resubscribe_full_state/test-config.yaml b/tests/channels/pjsip/subscriptions/rls/lists_of_lists/nominal/mwi/resubscribe_full_state/test-config.yaml
index 34980b1..08eb1b4 100644
--- a/tests/channels/pjsip/subscriptions/rls/lists_of_lists/nominal/mwi/resubscribe_full_state/test-config.yaml
+++ b/tests/channels/pjsip/subscriptions/rls/lists_of_lists/nominal/mwi/resubscribe_full_state/test-config.yaml
@@ -44,10 +44,11 @@
                 - { 'key-args': {'scenario': 'resubscribe.xml', '-i': '127.0.0.1', '-p': '5061', '-s': 'mail_list'} }
 
 test-config:
-    list_name: 'mail_list'
-    resources:
+    list-name: 'mail_list'
+    packets:
         -
-            {
+            full-state: True
+            resources: {
                 'mail_sublist': {
                     'type': 'Multipart',
                     'state': 'active',
@@ -74,7 +75,8 @@
                 }
             }
         -
-            {
+            full-state: True
+            resources: {
                 'mail_sublist': {
                     'type': 'Multipart',
                     'state': 'active',
@@ -100,9 +102,3 @@
                     'messages_waiting': 'no'
                 }
             }
-
-    full_state:
-        -
-            True
-        -
-            True
diff --git a/tests/channels/pjsip/subscriptions/rls/lists_of_lists/nominal/mwi/termination_full_state/test-config.yaml b/tests/channels/pjsip/subscriptions/rls/lists_of_lists/nominal/mwi/termination_full_state/test-config.yaml
index 06df276..54e7c11 100644
--- a/tests/channels/pjsip/subscriptions/rls/lists_of_lists/nominal/mwi/termination_full_state/test-config.yaml
+++ b/tests/channels/pjsip/subscriptions/rls/lists_of_lists/nominal/mwi/termination_full_state/test-config.yaml
@@ -46,10 +46,11 @@
                 - { 'key-args': {'scenario': 'termination.xml', '-i': '127.0.0.1', '-p': '5061', '-s': 'mail_list'} }
 
 test-config:
-    list_name: 'mail_list'
-    resources:
+    list-name: 'mail_list'
+    packets:
         -
-            {
+            full-state: True
+            resources: {
                 'mail_sublist': {
                     'type': 'Multipart',
                     'state': 'active',
@@ -76,7 +77,8 @@
                 }
             }
         -
-            {
+            full-state: True
+            resources: {
                 'mail_sublist': {
                     'type': 'Multipart',
                     'state': 'terminated',
@@ -102,9 +104,3 @@
                     'messages_waiting': 'no'
                 }
             }
-
-    full_state:
-        -
-            True
-        -
-            True
diff --git a/tests/channels/pjsip/subscriptions/rls/lists_of_lists/nominal/presence/batched/test-config.yaml b/tests/channels/pjsip/subscriptions/rls/lists_of_lists/nominal/presence/batched/test-config.yaml
index e5e497e..f633b7e 100644
--- a/tests/channels/pjsip/subscriptions/rls/lists_of_lists/nominal/presence/batched/test-config.yaml
+++ b/tests/channels/pjsip/subscriptions/rls/lists_of_lists/nominal/presence/batched/test-config.yaml
@@ -45,10 +45,11 @@
                 - { 'key-args': {'scenario': 'subscribe.xml', '-i': '127.0.0.1', '-p': '5061', '-s': 'pres_list_a'} }
 
 test-config:
-    list_name: 'pres_list_a'
-    resources:
+    list-name: 'pres_list_a'
+    packets:
         -
-            {
+            full-state: True
+            resources: {
                 'pres_list_b': {
                     'type': 'Multipart', 'state': 'active', 'sublist': {
                         'alice': {'type': 'PIDF', 'state': 'active'},
@@ -57,7 +58,8 @@
                 }
             }
         -
-            {
+            full-state: False
+            resources: {
                 'pres_list_b': {
                     'type': 'Multipart', 'state': 'active', 'sublist': {
                         'alice': {'type': 'PIDF', 'state': 'active'},
@@ -65,17 +67,11 @@
                 }
             }
         -
-            {
+            full-state: False
+            resources: {
                 'pres_list_b': {
                     'type': 'Multipart', 'state': 'active', 'sublist': {
                         'bob': {'type': 'PIDF', 'state': 'active'}
                     }
                 }
             }
-    full_state:
-        -
-            True
-        -
-            False
-        -
-            False
diff --git a/tests/channels/pjsip/subscriptions/rls/lists_of_lists/nominal/presence/full_state_alice/test-config.yaml b/tests/channels/pjsip/subscriptions/rls/lists_of_lists/nominal/presence/full_state_alice/test-config.yaml
index 9cd18fe..77bf85e 100644
--- a/tests/channels/pjsip/subscriptions/rls/lists_of_lists/nominal/presence/full_state_alice/test-config.yaml
+++ b/tests/channels/pjsip/subscriptions/rls/lists_of_lists/nominal/presence/full_state_alice/test-config.yaml
@@ -41,10 +41,11 @@
                 - { 'key-args': {'scenario': 'list_subscribe.xml', '-i': '127.0.0.1', '-p': '5061', '-s': 'pres_list'} }
 
 test-config:
-    list_name: 'pres_list'
-    resources:
+    list-name: 'pres_list'
+    packets:
         -
-            {
+            full-state: True
+            resources: {
                 'pres_sublist': {
                     'type': 'Multipart', 'state': 'active', 'sublist': {
                         'alice': {'type': 'PIDF', 'state': 'active'},
@@ -54,7 +55,8 @@
                 'carol': {'type': 'PIDF', 'state': 'active'}
             }
         -
-            {
+            full-state: True
+            resources: {
                 'pres_sublist': {
                     'type': 'Multipart', 'state': 'active', 'sublist': {
                         'alice': {'type': 'PIDF', 'state': 'active'},
@@ -63,11 +65,6 @@
                 },
                 'carol': {'type': 'PIDF', 'state': 'active'}
             }
-    full_state:
-        -
-            True
-        -
-            True
-    ami_action:
+    ami-action:
         -
             { 'Action': 'SetVar', 'Variable': 'DEVICE_STATE(Custom:alice)', 'Value': 'INUSE' }
diff --git a/tests/channels/pjsip/subscriptions/rls/lists_of_lists/nominal/presence/full_state_carol/test-config.yaml b/tests/channels/pjsip/subscriptions/rls/lists_of_lists/nominal/presence/full_state_carol/test-config.yaml
index b290d40..92e17a5 100644
--- a/tests/channels/pjsip/subscriptions/rls/lists_of_lists/nominal/presence/full_state_carol/test-config.yaml
+++ b/tests/channels/pjsip/subscriptions/rls/lists_of_lists/nominal/presence/full_state_carol/test-config.yaml
@@ -41,10 +41,11 @@
                 - { 'key-args': {'scenario': 'list_subscribe.xml', '-i': '127.0.0.1', '-p': '5061', '-s': 'pres_list'} }
 
 test-config:
-    list_name: 'pres_list'
-    resources:
+    list-name: 'pres_list'
+    packets:
         -
-            {
+            full-state: True
+            resources: {
                 'pres_sublist': {
                     'type': 'Multipart', 'state': 'active', 'sublist': {
                         'alice': {'type': 'PIDF', 'state': 'active'},
@@ -54,7 +55,8 @@
                 'carol': {'type': 'PIDF', 'state': 'active'}
             }
         -
-            {
+            full-state: True
+            resources: {
                 'pres_sublist': {
                     'type': 'Multipart', 'state': 'active', 'sublist': {
                         'alice': {'type': 'PIDF', 'state': 'active'},
@@ -63,11 +65,6 @@
                 },
                 'carol': {'type': 'PIDF', 'state': 'active'}
             }
-    full_state:
-        -
-            True
-        -
-            True
-    ami_action:
+    ami-action:
         -
             { 'Action': 'SetVar', 'Variable': 'DEVICE_STATE(Custom:carol)', 'Value': 'INUSE' }
diff --git a/tests/channels/pjsip/subscriptions/rls/lists_of_lists/nominal/presence/initial_notify/test-config.yaml b/tests/channels/pjsip/subscriptions/rls/lists_of_lists/nominal/presence/initial_notify/test-config.yaml
index 765eff8..aa405e0 100644
--- a/tests/channels/pjsip/subscriptions/rls/lists_of_lists/nominal/presence/initial_notify/test-config.yaml
+++ b/tests/channels/pjsip/subscriptions/rls/lists_of_lists/nominal/presence/initial_notify/test-config.yaml
@@ -55,10 +55,11 @@
                 - { 'key-args': {'scenario': 'list_subscribe.xml', '-i': '127.0.0.1', '-p': '5061', '-s': 'pres_list'} }
 
 test-config:
-    list_name: 'pres_list'
-    resources:
+    list-name: 'pres_list'
+    packets:
         -
-            {
+            full-state: True
+            resources: {
                 'pres_sublist': {
                     'type': 'Multipart', 'state': 'active', 'sublist': {
                         'alice': {'type': 'PIDF', 'state': 'active'},
@@ -67,6 +68,3 @@
                 },
                 'carol': {'type': 'PIDF', 'state': 'active'}
             }
-    full_state:
-        -
-            True
diff --git a/tests/channels/pjsip/subscriptions/rls/lists_of_lists/nominal/presence/listception_initial_notify/test-config.yaml b/tests/channels/pjsip/subscriptions/rls/lists_of_lists/nominal/presence/listception_initial_notify/test-config.yaml
index 85762e4..80a0542 100644
--- a/tests/channels/pjsip/subscriptions/rls/lists_of_lists/nominal/presence/listception_initial_notify/test-config.yaml
+++ b/tests/channels/pjsip/subscriptions/rls/lists_of_lists/nominal/presence/listception_initial_notify/test-config.yaml
@@ -36,10 +36,11 @@
                 - { 'key-args': {'scenario': 'list_subscribe.xml', '-i': '127.0.0.1', '-p': '5061', '-s': 'pres_list'} }
 
 test-config:
-    list_name: 'pres_list'
-    resources:
+    list-name: 'pres_list'
+    packets:
         -
-            {
+            full-state: True
+            resources: {
                 'pres_sublist': {
                     'type': 'Multipart', 'state': 'active', 'sublist': {
                         'alice': {'type': 'PIDF', 'state': 'active'},
@@ -53,6 +54,3 @@
                 },
                 'carol': {'type': 'PIDF', 'state': 'active'}
             }
-    full_state:
-        -
-            True
diff --git a/tests/channels/pjsip/subscriptions/rls/lists_of_lists/nominal/presence/partial_state_alice/test-config.yaml b/tests/channels/pjsip/subscriptions/rls/lists_of_lists/nominal/presence/partial_state_alice/test-config.yaml
index a49f46f..c1c9f66 100644
--- a/tests/channels/pjsip/subscriptions/rls/lists_of_lists/nominal/presence/partial_state_alice/test-config.yaml
+++ b/tests/channels/pjsip/subscriptions/rls/lists_of_lists/nominal/presence/partial_state_alice/test-config.yaml
@@ -42,10 +42,11 @@
                 - { 'key-args': {'scenario': 'list_subscribe.xml', '-i': '127.0.0.1', '-p': '5061', '-s': 'pres_list'} }
 
 test-config:
-    list_name: 'pres_list'
-    resources:
+    list-name: 'pres_list'
+    packets:
         -
-            {
+            full-state: True
+            resources: {
                 'pres_sublist': {
                     'type': 'Multipart', 'state': 'active', 'sublist': {
                         'alice': {'type': 'PIDF', 'state': 'active'},
@@ -55,18 +56,14 @@
                 'carol': {'type': 'PIDF', 'state': 'active'}
             }
         -
-            {
+            full-state: False
+            resources: {
                 'pres_sublist': {
                     'type': 'Multipart', 'state': 'active', 'sublist': {
                         'alice': {'type': 'PIDF', 'state': 'active'},
                     }
                 }
             }
-    full_state:
-        -
-            True
-        -
-            False
-    ami_action:
+    ami-action:
         -
             { 'Action': 'SetVar', 'Variable': 'DEVICE_STATE(Custom:alice)', 'Value': 'INUSE' }
diff --git a/tests/channels/pjsip/subscriptions/rls/lists_of_lists/nominal/presence/partial_state_carol/test-config.yaml b/tests/channels/pjsip/subscriptions/rls/lists_of_lists/nominal/presence/partial_state_carol/test-config.yaml
index eb43555..38f6dec 100644
--- a/tests/channels/pjsip/subscriptions/rls/lists_of_lists/nominal/presence/partial_state_carol/test-config.yaml
+++ b/tests/channels/pjsip/subscriptions/rls/lists_of_lists/nominal/presence/partial_state_carol/test-config.yaml
@@ -42,10 +42,11 @@
                 - { 'key-args': {'scenario': 'list_subscribe.xml', '-i': '127.0.0.1', '-p': '5061', '-s': 'pres_list'} }
 
 test-config:
-    list_name: 'pres_list'
-    resources:
+    list-name: 'pres_list'
+    packets:
         -
-            {
+            full-state: True
+            resources: {
                 'pres_sublist': {
                     'type': 'Multipart', 'state': 'active', 'sublist': {
                         'alice': {'type': 'PIDF', 'state': 'active'},
@@ -55,14 +56,10 @@
                 'carol': {'type': 'PIDF', 'state': 'active'}
             }
         -
-            {
+            full-state: False
+            resources: {
                 'carol': {'type': 'PIDF', 'state': 'active'}
             }
-    full_state:
-        -
-            True
-        -
-            False
-    ami_action:
+    ami-action:
         -
             { 'Action': 'SetVar', 'Variable': 'DEVICE_STATE(Custom:carol)', 'Value': 'INUSE' }
diff --git a/tests/channels/pjsip/subscriptions/rls/lists_of_lists/nominal/presence/resubscribe_full_state/test-config.yaml b/tests/channels/pjsip/subscriptions/rls/lists_of_lists/nominal/presence/resubscribe_full_state/test-config.yaml
index bf76826..3100564 100644
--- a/tests/channels/pjsip/subscriptions/rls/lists_of_lists/nominal/presence/resubscribe_full_state/test-config.yaml
+++ b/tests/channels/pjsip/subscriptions/rls/lists_of_lists/nominal/presence/resubscribe_full_state/test-config.yaml
@@ -42,10 +42,11 @@
                 - { 'key-args': {'scenario': 'resubscribe.xml', '-i': '127.0.0.1', '-p': '5061', '-s': 'pres_list'} }
 
 test-config:
-    list_name: 'pres_list'
-    resources:
+    list-name: 'pres_list'
+    packets:
         -
-            {
+            full-state: True
+            resources: {
                 'pres_sublist': {
                     'type': 'Multipart', 'state': 'active', 'sublist': {
                         'alice': {'type': 'PIDF', 'state': 'active'},
@@ -55,7 +56,8 @@
                 'carol': {'type': 'PIDF', 'state': 'active'}
             }
         -
-            {
+            full-state: True
+            resources: {
                 'pres_sublist': {
                     'type': 'Multipart', 'state': 'active', 'sublist': {
                         'alice': {'type': 'PIDF', 'state': 'active'},
@@ -64,9 +66,3 @@
                 },
                 'carol': {'type': 'PIDF', 'state': 'active'}
             }
-
-    full_state:
-        -
-            True
-        -
-            True
diff --git a/tests/channels/pjsip/subscriptions/rls/lists_of_lists/nominal/presence/termination_full_state/test-config.yaml b/tests/channels/pjsip/subscriptions/rls/lists_of_lists/nominal/presence/termination_full_state/test-config.yaml
index da0e653..d0c5a76 100644
--- a/tests/channels/pjsip/subscriptions/rls/lists_of_lists/nominal/presence/termination_full_state/test-config.yaml
+++ b/tests/channels/pjsip/subscriptions/rls/lists_of_lists/nominal/presence/termination_full_state/test-config.yaml
@@ -43,10 +43,11 @@
                 - { 'key-args': {'scenario': 'termination.xml', '-i': '127.0.0.1', '-p': '5061', '-s': 'pres_list'} }
 
 test-config:
-    list_name: 'pres_list'
-    resources:
+    list-name: 'pres_list'
+    packets:
         -
-            {
+            full-state: True
+            resources: {
                 'pres_sublist': {
                     'type': 'Multipart', 'state': 'active', 'sublist': {
                         'alice': {'type': 'PIDF', 'state': 'active'},
@@ -56,7 +57,8 @@
                 'carol': {'type': 'PIDF', 'state': 'active'}
             }
         -
-            {
+            full-state: True
+            resources: {
                 'pres_sublist': {
                     'type': 'Multipart', 'state': 'terminated', 'sublist': {
                         'alice': {'type': 'PIDF', 'state': 'terminated'},
@@ -65,9 +67,3 @@
                 },
                 'carol': {'type': 'PIDF', 'state': 'terminated'}
             }
-
-    full_state:
-        -
-            True
-        -
-            True
diff --git a/tests/channels/pjsip/subscriptions/rls/lists_of_lists/off_nominal/mwi/resource_duplication/test-config.yaml b/tests/channels/pjsip/subscriptions/rls/lists_of_lists/off_nominal/mwi/resource_duplication/test-config.yaml
index ac8cc65..275712f 100644
--- a/tests/channels/pjsip/subscriptions/rls/lists_of_lists/off_nominal/mwi/resource_duplication/test-config.yaml
+++ b/tests/channels/pjsip/subscriptions/rls/lists_of_lists/off_nominal/mwi/resource_duplication/test-config.yaml
@@ -61,10 +61,11 @@
                 - { 'key-args': {'scenario': 'list_subscribe.xml', '-i': '127.0.0.1', '-p': '5061', '-s': 'mail_list'} }
 
 test-config:
-    list_name: 'mail_list'
-    resources:
+    list-name: 'mail_list'
+    packets:
         -
-            {
+            full-state: True
+            resources: {
                 # Primary list carol wins because it was listed before mail_sublist
                 'carol': {
                     'type': 'MWI',
@@ -91,6 +92,3 @@
                     }
                 }
             }
-    full_state:
-        -
-            True
diff --git a/tests/channels/pjsip/subscriptions/rls/lists_of_lists/off_nominal/mwi/shared_name_w_list_support/test-config.yaml b/tests/channels/pjsip/subscriptions/rls/lists_of_lists/off_nominal/mwi/shared_name_w_list_support/test-config.yaml
index 21e5584..45ddead 100644
--- a/tests/channels/pjsip/subscriptions/rls/lists_of_lists/off_nominal/mwi/shared_name_w_list_support/test-config.yaml
+++ b/tests/channels/pjsip/subscriptions/rls/lists_of_lists/off_nominal/mwi/shared_name_w_list_support/test-config.yaml
@@ -60,10 +60,11 @@
                 - { 'key-args': {'scenario': 'list_subscribe.xml', '-i': '127.0.0.1', '-p': '5061', '-s': 'carol'} }
 
 test-config:
-    list_name: 'carol'
-    resources:
+    list-name: 'carol'
+    packets:
         -
-            {
+            full-state: True
+            resources: {
                 'alice': {
                     'type': 'MWI',
                     'state': 'active',
@@ -83,6 +84,3 @@
                     }
                 }
             }
-    full_state:
-        -
-            True
diff --git a/tests/channels/pjsip/subscriptions/rls/lists_of_lists/off_nominal/presence/resource_duplication/test-config.yaml b/tests/channels/pjsip/subscriptions/rls/lists_of_lists/off_nominal/presence/resource_duplication/test-config.yaml
index 207b50b..ec23387 100644
--- a/tests/channels/pjsip/subscriptions/rls/lists_of_lists/off_nominal/presence/resource_duplication/test-config.yaml
+++ b/tests/channels/pjsip/subscriptions/rls/lists_of_lists/off_nominal/presence/resource_duplication/test-config.yaml
@@ -59,10 +59,11 @@
                 - { 'key-args': {'scenario': 'list_subscribe.xml', '-i': '127.0.0.1', '-p': '5061', '-s': 'pres_list'} }
 
 test-config:
-    list_name: 'pres_list'
-    resources:
+    list-name: 'pres_list'
+    packets:
         -
-            {
+            full-state: True
+            resources: {
                 'pres_sublist': {
                     'type': 'Multipart', 'state': 'active', 'sublist': {
                         'alice': {'type': 'PIDF', 'state': 'active'},
@@ -71,6 +72,3 @@
                     }
                 },
             }
-    full_state:
-        -
-            True
diff --git a/tests/channels/pjsip/subscriptions/rls/lists_of_lists/off_nominal/presence/shared_name_w_list_support/test-config.yaml b/tests/channels/pjsip/subscriptions/rls/lists_of_lists/off_nominal/presence/shared_name_w_list_support/test-config.yaml
index cc55095..f750a40 100644
--- a/tests/channels/pjsip/subscriptions/rls/lists_of_lists/off_nominal/presence/shared_name_w_list_support/test-config.yaml
+++ b/tests/channels/pjsip/subscriptions/rls/lists_of_lists/off_nominal/presence/shared_name_w_list_support/test-config.yaml
@@ -55,10 +55,11 @@
                 - { 'key-args': {'scenario': 'list_subscribe.xml', '-i': '127.0.0.1', '-p': '5061', '-s': 'carol'} }
 
 test-config:
-    list_name: 'carol'
-    resources:
+    list-name: 'carol'
+    packets:
         -
-            {
+            full-state: True
+            resources: {
                 'pres_sublist': {
                     'type': 'Multipart', 'state': 'active', 'sublist': {
                         'bob': {'type': 'PIDF', 'state': 'active'},
@@ -66,6 +67,3 @@
                 },
                 'alice': {'type': 'PIDF', 'state': 'active'}
             }
-    full_state:
-        -
-            True
diff --git a/tests/channels/pjsip/subscriptions/rls/rls_test.py b/tests/channels/pjsip/subscriptions/rls/rls_test.py
index b4ea080..f0b64e2 100755
--- a/tests/channels/pjsip/subscriptions/rls/rls_test.py
+++ b/tests/channels/pjsip/subscriptions/rls/rls_test.py
@@ -44,14 +44,17 @@
         self.token = test_object.create_fail_token("Haven't handled all "
                                                    "expected NOTIFY packets.")
 
-        self.resources = module_config['resources']
-        self.list_name = module_config['list_name']
-        self.full_state = module_config['full_state']
-        self.ami_action = module_config.get('ami_action')
-        self.stop_after_notifys = module_config.get('stop_after_notifys', True)
 
-        self.version = 0
+        self.list_name = module_config['list-name']
+        self.log_packets = module_config.get("log-packets", False)
+        self.packets = module_config['packets']
+        self.ami_action = module_config.get('ami-action')
+        self.stop_test_after_notifys = \
+            module_config.get("stop-test-after-notifys", True)
+
+
         self.ami = None
+        self.packets_idx = 0
         self.test_object.register_ami_observer(self.ami_connect)
         if hasattr(self.test_object, 'register_scenario_started_observer'):
             self.test_object.register_scenario_started_observer(
@@ -93,34 +96,38 @@
                          'multipart body')
             return
 
-        if self.version >= len(self.resources):
+        if self.packets_idx >= len(self.packets):
             LOGGER.debug('Ignoring packet, version is higher than count of ' +
                          'test expectations')
             return
 
+        resources = self.packets[self.packets_idx]["resources"]
+        full_state = self.packets[self.packets_idx]["full-state"]
+
         validator = RLSValidator(test_object=self.test_object,
                                  packet=packet,
-                                 version=self.version,
-                                 full_state=self.full_state[self.version],
+                                 version=self.packets_idx,
+                                 full_state=full_state,
                                  list_name=self.list_name,
-                                 resources=self.resources[self.version])
+                                 resources=resources)
 
         debug_msg = "validating packet -- expecting {0}"
-        LOGGER.debug(debug_msg.format(self.resources[self.version]))
+        LOGGER.debug(debug_msg.format(self.packets[self.packets_idx]))
         if not validator.check_integrity():
             LOGGER.error('Integrity Check Failed.')
             return
 
         info_msg = "Packet validated successfully. Test Phase {0} Completed."
-        LOGGER.info(info_msg.format(self.version))
-        self.version += 1
+        LOGGER.info(info_msg.format(self.packets_idx))
+        self.packets_idx += 1
 
-        if self.version == len(self.resources):
+        if self.packets_idx == len(self.packets):
             info_msg = "All test phases completed. RLS verification complete."
             LOGGER.info(info_msg)
             self.test_object.remove_fail_token(self.token)
             if self.stop_after_notifys:
-                # We only deal with as many NOTIFIES as we have resources
+                # We only deal with as many NOTIFIES as we have defined in our
+                # test-config.yaml
                 self.test_object.set_passed(True)
                 self.test_object.stop_reactor()
 

-- 
To view, visit https://gerrit.asterisk.org/1536
To unsubscribe, visit https://gerrit.asterisk.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: Iefaefddff202e1c4caf334b71ba6a51827bb91b5
Gerrit-PatchSet: 3
Gerrit-Project: testsuite
Gerrit-Branch: master
Gerrit-Owner: Ashley Sanders <asanders at digium.com>
Gerrit-Reviewer: Anonymous Coward #1000019
Gerrit-Reviewer: Corey Farrell <git at cfware.com>
Gerrit-Reviewer: Jonathan Rose <jrose at digium.com>
Gerrit-Reviewer: Joshua Colp <jcolp at digium.com>



More information about the asterisk-code-review mailing list