X-Git-Url: https://gerrit.fd.io/r/gitweb?p=csit.git;a=blobdiff_plain;f=resources%2Ftest_data%2Fhoneycomb%2Fnetconf%2Ftriggers.py;h=0db68dd1f0d6fa9acb21830d5f709f4c926928a2;hp=c3a72e4df4ee68b927a90991864e19a7634d0e3c;hb=67f247b4015b76641c6fab7c49e7d9862043c856;hpb=cbc22f742633725fb44e4a95b43a301a7da0355c

diff --git a/resources/test_data/honeycomb/netconf/triggers.py b/resources/test_data/honeycomb/netconf/triggers.py
index c3a72e4df4..0db68dd1f0 100644
--- a/resources/test_data/honeycomb/netconf/triggers.py
+++ b/resources/test_data/honeycomb/netconf/triggers.py
@@ -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>
@@ -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>
@@ -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>
@@ -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>
@@ -285,10 +285,9 @@ a:operation="replace">
 </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,7 +296,6 @@ a:operation="replace">
 <arp-termination>false</arp-termination>
 </bridge-domain>
 </bridge-domains>
-</vpp>
 </config>
 </edit-config>
 </rpc>
@@ -347,10 +345,10 @@ trigger_revert1 = u"""
 <interfaces xmlns="urn:ietf:params:xml:ns:yang:ietf-interfaces">
 <interface>
 <name>vxlan3</name>
-<type xmlns:v3po="urn:opendaylight:params:xml:ns:yang:v3po">
+<type xmlns:v3po="http://fd.io/hc2vpp/yang/v3po">
     v3po:vxlan-tunnel</type>
 <enabled>true</enabled>
-<vxlan xmlns="urn:opendaylight:params:xml:ns:yang:v3po">
+<vxlan xmlns="http://fd.io/hc2vpp/yang/v3po">
 <src>192.168.1.6</src>
 <dst>192.168.1.7</dst>
 <vni>9</vni>
@@ -363,7 +361,7 @@ trigger_revert1 = u"""
 </rpc>
 ]]>]]>
 
-<rpc message-id="101" xmlns="urn:ietf:params:xml:ns:netconf:base:1.0">
+<rpc message-id="102" xmlns="urn:ietf:params:xml:ns:netconf:base:1.0">
 <edit-config>
 <target>
 <candidate/>
@@ -372,10 +370,10 @@ trigger_revert1 = u"""
 <interfaces xmlns="urn:ietf:params:xml:ns:yang:ietf-interfaces">
 <interface>
 <name>vxlan4</name>
-<type xmlns:v3po="urn:opendaylight:params:xml:ns:yang:v3po">
+<type xmlns:v3po="http://fd.io/hc2vpp/yang/v3po">
     v3po:vxlan-tunnel</type>
 <enabled>true</enabled>
-<vxlan xmlns="urn:opendaylight:params:xml:ns:yang:v3po">
+<vxlan xmlns="http://fd.io/hc2vpp/yang/v3po">
 <src>192.168.1.6</src>
 <dst>192.168.1.7</dst>
 <vni>9</vni>
@@ -388,7 +386,7 @@ trigger_revert1 = u"""
 </rpc>
 ]]>]]>
 
- <rpc message-id="102"
+ <rpc message-id="103"
       xmlns="urn:ietf:params:xml:ns:netconf:base:1.0">
    <commit/>
  </rpc>
@@ -406,10 +404,10 @@ trigger_revert2 = u"""
 <interfaces xmlns="urn:ietf:params:xml:ns:yang:ietf-interfaces">
 <interface>
 <name>tap</name>
-<type xmlns:v3po="urn:opendaylight:params:xml:ns:yang:v3po">v3po:tap</type>
+<type xmlns:v3po="http://fd.io/hc2vpp/yang/v3po">v3po:tap-v2</type>
 <enabled>true</enabled>
-<tap xmlns="urn:opendaylight:params:xml:ns:yang:v3po">
-<tap-name>tap</tap-name>
+<tap xmlns="http://fd.io/hc2vpp/yang/v3po">
+<dev-name>tap</dev-name>
 </tap>
 </interface>
 </interfaces>
@@ -418,7 +416,7 @@ trigger_revert2 = u"""
 </rpc>
 ]]>]]>
 
-<rpc message-id="101" xmlns="urn:ietf:params:xml:ns:netconf:base:1.0">
+<rpc message-id="102" xmlns="urn:ietf:params:xml:ns:netconf:base:1.0">
 <edit-config>
 <target>
 <candidate/>
@@ -427,10 +425,10 @@ trigger_revert2 = u"""
 <interfaces xmlns="urn:ietf:params:xml:ns:yang:ietf-interfaces">
 <interface>
 <name>tap2</name>
-<type xmlns:v3po="urn:opendaylight:params:xml:ns:yang:v3po">v3po:tap</type>
+<type xmlns:v3po="http://fd.io/hc2vpp/yang/v3po">v3po:tap-v2</type>
 <enabled>true</enabled>
-<tap xmlns="urn:opendaylight:params:xml:ns:yang:v3po">
-<tap-name>tap</tap-name>
+<tap xmlns="http://fd.io/hc2vpp/yang/v3po">
+<dev-name>tap</dev-name>
 </tap>
 </interface>
 </interfaces>
@@ -439,8 +437,93 @@ trigger_revert2 = u"""
 </rpc>
 ]]>]]>
 
- <rpc message-id="102"
-      xmlns="urn:ietf:params:xml:ns:netconf:base:1.0">
-   <commit/>
- </rpc>
- ]]>]]>"""
\ No newline at end of file
+<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