Improve test tag string parsing

[csit.git] / resources / libraries / robot / honeycomb / notifications.robot

diff --git a/resources/libraries/robot/honeycomb/notifications.robot b/resources/libraries/robot/honeycomb/notifications.robot
index ded8d3a..c5a4817 100644 (file)
--- a/resources/libraries/robot/honeycomb/notifications.robot
+++ b/resources/libraries/robot/honeycomb/notifications.robot
@@ -12,35 +12,24 @@
 # limitations under the License.
 
 *** Settings ***
-| Library | resources.libraries.python.honeycomb.Notifications | ${hello}
-| ... | ${subscription}
+| Library | resources.libraries.python.honeycomb.Notifications
+| Variables | resources/test_data/honeycomb/netconf/hello.py
+| Variables | resources/test_data/honeycomb/netconf/subscription.py
 | Documentation | Keywords used to test Honeycomb notifications over Netconf.
 
-*** Variables ***
-# hello message sent to Honeycomb through Netconf
-| ${hello}= | <hello xmlns="urn:ietf:params:xml:ns:netconf:base:1.0">
-| ... | <capabilities><capability>urn:ietf:params:netconf:base:1.0
-| ... | </capability></capabilities></hello>]]>]]>
-# rpc call to add a subscription to Netconf notifications
-| ${subscription}= | <netconf:rpc netconf:message-id="101"
-| ... | xmlns:netconf="urn:ietf:params:xml:ns:netconf:base:1.0">
-| ... | <create-subscription
-| ... | xmlns="urn:ietf:params:xml:ns:netconf:notification:1.0">
-| ... | <stream>honeycomb</stream></create-subscription></netconf:rpc>]]>]]>
-
 *** Keywords ***
-| Notification listener is established
+| Notification listener should be established
 | | [Documentation] | Connects to Honeycomb notification service.
 | | ...
 | | ... | *Arguments:*
-| | ... | - node - information about a DUT node. Type: dictionary
+| | ... | - node - information about a DUT node. Type: dict
 | | ...
 | | ... | *Example:*
 | | ...
-| | ... | \| Notification listener is established \| ${nodes['DUT1']} \|
+| | ... | \| Notification listener should be established \| ${nodes['DUT1']} \|
 | | [Arguments] | ${node}
-| | Create session | ${node}
-| | Add notification listener
+| | Create session | ${node} | ${hello}
+| | Add notification listener | ${subscription}
 
 | Honeycomb should send interface state notification
 | | [Documentation] | Reads notification from Honeycomb and verifies\
@@ -56,7 +45,7 @@
 | | ... | \| GigabitEthernet0/8/0 \| up \|
 | | [Arguments] | ${interface} | ${state}
 | | ${reply}= | Get notification
-| | Should contain | ${reply} | <interface-state-change
+| | Should contain | ${reply} | <interface-change
 | | Should contain | ${reply} | <name>${interface}</name>
 | | Should contain | ${reply} | <admin-status>${state}</admin-status>