X-Git-Url: https://gerrit.fd.io/r/gitweb?p=csit.git;a=blobdiff_plain;f=resources%2Ftest_data%2Fhoneycomb%2Fnetconf%2Ftriggers.py;h=8cdfcd938075f2342ba39e65d097853ac9ca08ba;hp=77596bd0527984d480123ec4956247be91004834;hb=ae7e4fc1d7766027cf9cc7fcd3b5a3ad29af964e;hpb=dec1188c7f89f5f8f97085b5f68c6f1d918586b8

diff --git a/resources/test_data/honeycomb/netconf/triggers.py b/resources/test_data/honeycomb/netconf/triggers.py
index 77596bd052..8cdfcd9380 100644
--- a/resources/test_data/honeycomb/netconf/triggers.py
+++ b/resources/test_data/honeycomb/netconf/triggers.py
@@ -16,7 +16,7 @@
 # Test data for issue: https://jira.fd.io/browse/HONEYCOMB-105
 # Creating and removing interfaces may result in duplicated interface indices.
 trigger_105 = u"""
-<rpc message-id="m-27" xmlns="urn:ietf:params:xml:ns:netconf:base:1.0">
+<rpc message-id="m-1" xmlns="urn:ietf:params:xml:ns:netconf:base:1.0">
 <get-config>
 <source>
 <running/>
@@ -32,7 +32,7 @@ trigger_105 = u"""
 </rpc>
 ]]>]]>
 
-<rpc message-id="m-72" xmlns="urn:ietf:params:xml:ns:netconf:base:1.0">
+<rpc message-id="m-2" xmlns="urn:ietf:params:xml:ns:netconf:base:1.0">
 <lock>
 <target>
 <candidate/>
@@ -41,7 +41,7 @@ trigger_105 = u"""
 </rpc>
 ]]>]]>
 
-<rpc message-id="m-38" xmlns="urn:ietf:params:xml:ns:netconf:base:1.0">
+<rpc message-id="m-3" xmlns="urn:ietf:params:xml:ns:netconf:base:1.0">
 <edit-config>
 <target>
 <candidate/>
@@ -54,11 +54,11 @@ a:operation="replace">
 <name>4fe335c8-6fdc-4654-b12c-d256e9b39229</name>
 <description>neutron port</description>
 <link-up-down-trap-enable>enabled</link-up-down-trap-enable>
-<vhost-user xmlns="urn:opendaylight:params:xml:ns:yang:v3po">
+<vhost-user xmlns="http://fd.io/hc2vpp/yang/v3po">
 <role>client</role>
 <socket>/tmp/socket_4fe335c8-6fdc-4654-b12c-d256e9b39229</socket>
 </vhost-user>
-<type xmlns:x="urn:opendaylight:params:xml:ns:yang:v3po">x:vhost-user</type>
+<type xmlns:x="http://fd.io/hc2vpp/yang/v3po">x:vhost-user</type>
 <enabled>true</enabled>
 </interface>
 </interfaces>
@@ -67,12 +67,12 @@ a:operation="replace">
 </rpc>
 ]]>]]>
 
-<rpc message-id="m-80" xmlns="urn:ietf:params:xml:ns:netconf:base:1.0">
+<rpc message-id="m-4" xmlns="urn:ietf:params:xml:ns:netconf:base:1.0">
 <commit/>
 </rpc>
 ]]>]]>
 
-<rpc message-id="m-74" xmlns="urn:ietf:params:xml:ns:netconf:base:1.0">
+<rpc message-id="m-5" xmlns="urn:ietf:params:xml:ns:netconf:base:1.0">
 <unlock>
 <target>
 <candidate/>
@@ -81,7 +81,7 @@ a:operation="replace">
 </rpc>
 ]]>]]>
 
-<rpc message-id="m-72" xmlns="urn:ietf:params:xml:ns:netconf:base:1.0">
+<rpc message-id="m-6" xmlns="urn:ietf:params:xml:ns:netconf:base:1.0">
 <lock>
 <target>
 <candidate/>
@@ -90,7 +90,7 @@ a:operation="replace">
 </rpc>
 ]]>]]>
 
-<rpc message-id="m-43" xmlns="urn:ietf:params:xml:ns:netconf:base:1.0">
+<rpc message-id="m-7" xmlns="urn:ietf:params:xml:ns:netconf:base:1.0">
 <edit-config>
 <target>
 <candidate/>
@@ -108,12 +108,12 @@ a:operation="delete">
 </rpc>
 ]]>]]>
 
-<rpc message-id="m-80" xmlns="urn:ietf:params:xml:ns:netconf:base:1.0">
+<rpc message-id="m-8" xmlns="urn:ietf:params:xml:ns:netconf:base:1.0">
 <commit/>
 </rpc>
 ]]>]]>
 
-<rpc message-id="m-74" xmlns="urn:ietf:params:xml:ns:netconf:base:1.0">
+<rpc message-id="m-9" xmlns="urn:ietf:params:xml:ns:netconf:base:1.0">
 <unlock>
 <target>
 <candidate/>
@@ -122,7 +122,7 @@ a:operation="delete">
 </rpc>
 ]]>]]>
 
-<rpc message-id="m-72" xmlns="urn:ietf:params:xml:ns:netconf:base:1.0">
+<rpc message-id="m-10" xmlns="urn:ietf:params:xml:ns:netconf:base:1.0">
 <lock>
 <target>
 <candidate/>
@@ -131,7 +131,7 @@ a:operation="delete">
 </rpc>
 ]]>]]>
 
-<rpc message-id="m-50" xmlns="urn:ietf:params:xml:ns:netconf:base:1.0">
+<rpc message-id="m-11" xmlns="urn:ietf:params:xml:ns:netconf:base:1.0">
 <edit-config>
 <target>
 <candidate/>
@@ -144,11 +144,11 @@ a:operation="replace">
 <name>4fe335c8-6fdc-4654-b12c-d256e9b39229</name>
 <description>neutron port</description>
 <link-up-down-trap-enable>enabled</link-up-down-trap-enable>
-<vhost-user xmlns="urn:opendaylight:params:xml:ns:yang:v3po">
+<vhost-user xmlns="http://fd.io/hc2vpp/yang/v3po">
 <role>client</role>
 <socket>/tmp/socket_4fe335c8-6fdc-4654-b12c-d256e9b39229</socket>
 </vhost-user>
-<type xmlns:x="urn:opendaylight:params:xml:ns:yang:v3po">x:vhost-user</type>
+<type xmlns:x="http://fd.io/hc2vpp/yang/v3po">x:vhost-user</type>
 <enabled>true</enabled>
 </interface>
 </interfaces>
@@ -157,12 +157,12 @@ a:operation="replace">
 </rpc>
 ]]>]]>
 
-<rpc message-id="m-80" xmlns="urn:ietf:params:xml:ns:netconf:base:1.0">
+<rpc message-id="m-12" xmlns="urn:ietf:params:xml:ns:netconf:base:1.0">
 <commit/>
 </rpc>
 ]]>]]>
 
-<rpc message-id="m-74" xmlns="urn:ietf:params:xml:ns:netconf:base:1.0">
+<rpc message-id="m-13" xmlns="urn:ietf:params:xml:ns:netconf:base:1.0">
 <unlock>
 <target>
 <candidate/>
@@ -171,7 +171,7 @@ a:operation="replace">
 </rpc>
 ]]>]]>
 
-<rpc message-id="m-72" xmlns="urn:ietf:params:xml:ns:netconf:base:1.0">
+<rpc message-id="m-14" xmlns="urn:ietf:params:xml:ns:netconf:base:1.0">
 <lock>
 <target>
 <candidate/>
@@ -180,7 +180,7 @@ a:operation="replace">
 </rpc>
 ]]>]]>
 
-<rpc message-id="m-57" xmlns="urn:ietf:params:xml:ns:netconf:base:1.0">
+<rpc message-id="m-15" xmlns="urn:ietf:params:xml:ns:netconf:base:1.0">
 <edit-config>
 <target>
 <candidate/>
@@ -193,11 +193,11 @@ a:operation="replace">
 <name>d7611278-88ff-40e1-81e2-602e94e96fc7</name>
 <description>neutron port</description>
 <link-up-down-trap-enable>enabled</link-up-down-trap-enable>
-<vhost-user xmlns="urn:opendaylight:params:xml:ns:yang:v3po">
+<vhost-user xmlns="http://fd.io/hc2vpp/yang/v3po">
 <role>client</role>
 <socket>/tmp/socket_d7611278-88ff-40e1-81e2-602e94e96fc7</socket>
 </vhost-user>
-<type xmlns:x="urn:opendaylight:params:xml:ns:yang:v3po">x:vhost-user</type>
+<type xmlns:x="http://fd.io/hc2vpp/yang/v3po">x:vhost-user</type>
 <enabled>true</enabled>
 </interface>
 </interfaces>
@@ -206,12 +206,12 @@ a:operation="replace">
 </rpc>
 ]]>]]>
 
-<rpc message-id="m-80" xmlns="urn:ietf:params:xml:ns:netconf:base:1.0">
+<rpc message-id="m-16" xmlns="urn:ietf:params:xml:ns:netconf:base:1.0">
 <commit/>
 </rpc>
 ]]>]]>
 
-<rpc message-id="m-74" xmlns="urn:ietf:params:xml:ns:netconf:base:1.0">
+<rpc message-id="m-17" xmlns="urn:ietf:params:xml:ns:netconf:base:1.0">
 <unlock>
 <target>
 <candidate/>
@@ -220,7 +220,7 @@ a:operation="replace">
 </rpc>
 ]]>]]>
 
-<rpc message-id="m-72" xmlns="urn:ietf:params:xml:ns:netconf:base:1.0">
+<rpc message-id="m-18" xmlns="urn:ietf:params:xml:ns:netconf:base:1.0">
 <lock>
 <target>
 <candidate/>
@@ -229,7 +229,7 @@ a:operation="replace">
 </rpc>
 ]]>]]>
 
-<rpc message-id="m-64" xmlns="urn:ietf:params:xml:ns:netconf:base:1.0">
+<rpc message-id="m-19" xmlns="urn:ietf:params:xml:ns:netconf:base:1.0">
 <edit-config>
 <target>
 <candidate/>
@@ -242,11 +242,11 @@ a:operation="replace">
 <name>1f96a665-4351-4984-b1a8-dc6f54683123</name>
 <description>neutron port</description>
 <link-up-down-trap-enable>enabled</link-up-down-trap-enable>
-<vhost-user xmlns="urn:opendaylight:params:xml:ns:yang:v3po">
+<vhost-user xmlns="http://fd.io/hc2vpp/yang/v3po">
 <role>client</role>
 <socket>/tmp/socket_1f96a665-4351-4984-b1a8-dc6f54683123</socket>
 </vhost-user>
-<type xmlns:x="urn:opendaylight:params:xml:ns:yang:v3po">x:vhost-user</type>
+<type xmlns:x="http://fd.io/hc2vpp/yang/v3po">x:vhost-user</type>
 <enabled>true</enabled>
 </interface>
 </interfaces>
@@ -255,12 +255,12 @@ a:operation="replace">
 </rpc>
 ]]>]]>
 
-<rpc message-id="m-80" xmlns="urn:ietf:params:xml:ns:netconf:base:1.0">
+<rpc message-id="m-20" xmlns="urn:ietf:params:xml:ns:netconf:base:1.0">
 <commit/>
 </rpc>
 ]]>]]>
 
-<rpc message-id="m-74" xmlns="urn:ietf:params:xml:ns:netconf:base:1.0">
+<rpc message-id="m-21" xmlns="urn:ietf:params:xml:ns:netconf:base:1.0">
 <unlock>
 <target>
 <candidate/>
@@ -269,7 +269,7 @@ a:operation="replace">
 </rpc>
 ]]>]]>
 
-<rpc message-id="m-72" xmlns="urn:ietf:params:xml:ns:netconf:base:1.0">
+<rpc message-id="m-22" xmlns="urn:ietf:params:xml:ns:netconf:base:1.0">
 <lock>
 <target>
 <candidate/>
@@ -278,17 +278,16 @@ a:operation="replace">
 </rpc>
 ]]>]]>
 
-<rpc message-id="m-72" xmlns="urn:ietf:params:xml:ns:netconf:base:1.0">
+<rpc message-id="m-23" xmlns="urn:ietf:params:xml:ns:netconf:base:1.0">
 <edit-config>
 <target>
 <candidate/>
 </target>
 <default-operation>none</default-operation>
 <config>
-<vpp xmlns="urn:opendaylight:params:xml:ns:yang:v3po">
-<bridge-domains>
-<bridge-domain xmlns:a="urn:ietf:params:xml:ns:netconf:base:1.0"
-a:operation="replace">
+<bridge-domains xmlns="http://fd.io/hc2vpp/yang/v3po"
+xmlns:a="urn:ietf:params:xml:ns:netconf:base:1.0" a:operation="replace">
+<bridge-domain>
 <name>e86740a2-042c-4e64-a43b-cc224e0d5240</name>
 <unknown-unicast-flood>true</unknown-unicast-flood>
 <forward>true</forward>
@@ -297,18 +296,17 @@ a:operation="replace">
 <arp-termination>false</arp-termination>
 </bridge-domain>
 </bridge-domains>
-</vpp>
 </config>
 </edit-config>
 </rpc>
 ]]>]]>
 
-<rpc message-id="m-80" xmlns="urn:ietf:params:xml:ns:netconf:base:1.0">
+<rpc message-id="m-24" xmlns="urn:ietf:params:xml:ns:netconf:base:1.0">
 <commit/>
 </rpc>
 ]]>]]>
 
-<rpc message-id="m-74" xmlns="urn:ietf:params:xml:ns:netconf:base:1.0">
+<rpc message-id="m-25" xmlns="urn:ietf:params:xml:ns:netconf:base:1.0">
 <unlock>
 <target>
 <candidate/>
@@ -317,7 +315,7 @@ a:operation="replace">
 </rpc>
 ]]>]]>
 
-<rpc message-id="m-72" xmlns="urn:ietf:params:xml:ns:netconf:base:1.0">
+<rpc message-id="m-26" xmlns="urn:ietf:params:xml:ns:netconf:base:1.0">
 <lock>
 <target>
 <candidate/>
@@ -326,7 +324,7 @@ a:operation="replace">
 </rpc>
 ]]>]]>
 
-<rpc message-id="m-75" xmlns="urn:ietf:params:xml:ns:netconf:base:1.0">
+<rpc message-id="m-27" xmlns="urn:ietf:params:xml:ns:netconf:base:1.0">
 <get>
 <filter xmlns:ns0="urn:ietf:params:xml:ns:netconf:base:1.0" ns0:type="subtree">
 <interfaces-state xmlns="urn:ietf:params:xml:ns:yang:ietf-interfaces"/>
@@ -334,3 +332,198 @@ a:operation="replace">
 </get>
 </rpc>
 ]]>]]>"""
+
+# Test data for issue: https://jira.fd.io/browse/HONEYCOMB-255
+# Reverting transaction fails with "missing writer"
+trigger_revert1 = u"""
+<rpc message-id="101" xmlns="urn:ietf:params:xml:ns:netconf:base:1.0">
+<edit-config>
+<target>
+<candidate/>
+</target>
+<config>
+<interfaces xmlns="urn:ietf:params:xml:ns:yang:ietf-interfaces">
+<interface>
+<name>vxlan3</name>
+<type xmlns:v3po="http://fd.io/hc2vpp/yang/v3po">
+    v3po:vxlan-tunnel</type>
+<enabled>true</enabled>
+<vxlan xmlns="http://fd.io/hc2vpp/yang/v3po">
+<src>192.168.1.6</src>
+<dst>192.168.1.7</dst>
+<vni>9</vni>
+<encap-vrf-id>0</encap-vrf-id>
+</vxlan>
+</interface>
+</interfaces>
+</config>
+</edit-config>
+</rpc>
+]]>]]>
+
+<rpc message-id="102" xmlns="urn:ietf:params:xml:ns:netconf:base:1.0">
+<edit-config>
+<target>
+<candidate/>
+</target>
+<config>
+<interfaces xmlns="urn:ietf:params:xml:ns:yang:ietf-interfaces">
+<interface>
+<name>vxlan4</name>
+<type xmlns:v3po="http://fd.io/hc2vpp/yang/v3po">
+    v3po:vxlan-tunnel</type>
+<enabled>true</enabled>
+<vxlan xmlns="http://fd.io/hc2vpp/yang/v3po">
+<src>192.168.1.6</src>
+<dst>192.168.1.7</dst>
+<vni>9</vni>
+<encap-vrf-id>0</encap-vrf-id>
+</vxlan>
+</interface>
+</interfaces>
+</config>
+</edit-config>
+</rpc>
+]]>]]>
+
+ <rpc message-id="103"
+      xmlns="urn:ietf:params:xml:ns:netconf:base:1.0">
+   <commit/>
+ </rpc>
+ ]]>]]>"""
+
+# Test data for issue: https://jira.fd.io/browse/HONEYCOMB-255, part 2
+# Reverting transaction fails with "transaction has been closed"
+trigger_revert2 = u"""
+<rpc message-id="101" xmlns="urn:ietf:params:xml:ns:netconf:base:1.0">
+<edit-config>
+<target>
+<candidate/>
+</target>
+<config>
+<interfaces xmlns="urn:ietf:params:xml:ns:yang:ietf-interfaces">
+<interface>
+<name>tap</name>
+<type xmlns:v3po="http://fd.io/hc2vpp/yang/v3po">v3po:tap</type>
+<enabled>true</enabled>
+<tap xmlns="http://fd.io/hc2vpp/yang/v3po">
+<tap-name>tap</tap-name>
+</tap>
+</interface>
+</interfaces>
+</config>
+</edit-config>
+</rpc>
+]]>]]>
+
+<rpc message-id="102" xmlns="urn:ietf:params:xml:ns:netconf:base:1.0">
+<edit-config>
+<target>
+<candidate/>
+</target>
+<config>
+<interfaces xmlns="urn:ietf:params:xml:ns:yang:ietf-interfaces">
+<interface>
+<name>tap2</name>
+<type xmlns:v3po="http://fd.io/hc2vpp/yang/v3po">v3po:tap</type>
+<enabled>true</enabled>
+<tap xmlns="http://fd.io/hc2vpp/yang/v3po">
+<tap-name>tap</tap-name>
+</tap>
+</interface>
+</interfaces>
+</config>
+</edit-config>
+</rpc>
+]]>]]>
+
+<rpc message-id="103" xmlns="urn:ietf:params:xml:ns:netconf:base:1.0">
+<commit/>
+</rpc>
+]]>]]>"""
+
+
+# Test data for issue HC2VPP-60
+# Creating Vlan sub-interface over netconf fails due to ODL bug
+trigger_vlan = u"""
+<rpc message-id="101" xmlns="urn:ietf:params:xml:ns:netconf:base:1.0">
+<edit-config>
+<target>
+<candidate/>
+</target>
+<config>
+<interfaces xmlns="urn:ietf:params:xml:ns:yang:ietf-interfaces">
+<interface>
+<name>{interface}</name>
+<sub-interfaces xmlns="http://fd.io/hc2vpp/yang/vpp-vlan"/>
+</interface>
+</interfaces>
+</config>
+</edit-config>
+</rpc>
+]]>]]>
+
+<rpc message-id="102" xmlns="urn:ietf:params:xml:ns:netconf:base:1.0">
+<edit-config>
+<target>
+<candidate/>
+</target>
+<config>
+<interfaces xmlns="urn:ietf:params:xml:ns:yang:ietf-interfaces">
+<interface>
+<name>{interface}</name>
+<sub-interfaces xmlns="http://fd.io/hc2vpp/yang/vpp-vlan">
+<sub-interface>
+<identifier>2420</identifier>
+</sub-interface>
+</sub-interfaces>
+</interface>
+</interfaces>
+</config>
+</edit-config>
+</rpc>
+]]>]]>
+
+<rpc message-id="103" xmlns="urn:ietf:params:xml:ns:netconf:base:1.0">
+<edit-config>
+<target>
+<candidate/>
+</target>
+<default-operation>none</default-operation>
+<config>
+<interfaces xmlns="urn:ietf:params:xml:ns:yang:ietf-interfaces">
+<interface>
+<name>{interface}</name>
+<sub-interfaces xmlns="http://fd.io/hc2vpp/yang/vpp-vlan">
+<sub-interface xmlns:a="urn:ietf:params:xml:ns:netconf:base:1.0" a:operation="replace">
+<identifier>2420</identifier>
+<match>
+<vlan-tagged>
+<match-exact-tags>true</match-exact-tags>
+</vlan-tagged>
+</match>
+<vlan-type>_802dot1q</vlan-type>
+<enabled>false</enabled>
+<tags>
+<tag>
+<index>0</index>
+<dot1q-tag>
+<tag-type xmlns:x="urn:ieee:params:xml:ns:yang:dot1q-types">x:s-vlan</tag-type>
+<vlan-id>2420</vlan-id>
+</dot1q-tag>
+</tag>
+</tags>
+</sub-interface>
+</sub-interfaces>
+</interface>
+</interfaces>
+</config>
+</edit-config>
+</rpc>
+]]>]]>
+
+<rpc message-id="104" xmlns="urn:ietf:params:xml:ns:netconf:base:1.0">
+<commit/>
+</rpc>
+]]>]]>
+"""
\ No newline at end of file