aboutsummaryrefslogtreecommitdiffstats
path: root/resources/test_data/honeycomb
diff options
context:
space:
mode:
authorMichal Cmarada <mcmarada@cisco.com>2019-03-28 08:38:32 +0100
committerMichal Cmarada <mcmarada@cisco.com>2019-03-28 08:39:33 +0100
commit67f247b4015b76641c6fab7c49e7d9862043c856 (patch)
tree78fda2b03c27af0eb2e3a357df34fe1fcc5cbf91 /resources/test_data/honeycomb
parent2dc5924d35671c01e9aaa4ea6b9ae18bdd184ca8 (diff)
Fix Tap failing tests
Due to migration to Tap-v2 the old Tap API was removed. This fixes failing tests where Tap interface was used. Change-Id: I2f90177d2d8ee914e3ddcd3e10f212f9d72b9ac2 Signed-off-by: Michal Cmarada <mcmarada@cisco.com>
Diffstat (limited to 'resources/test_data/honeycomb')
-rw-r--r--resources/test_data/honeycomb/netconf/triggers.py8
-rw-r--r--resources/test_data/honeycomb/persistence.py18
2 files changed, 20 insertions, 6 deletions
diff --git a/resources/test_data/honeycomb/netconf/triggers.py b/resources/test_data/honeycomb/netconf/triggers.py
index 8cdfcd9380..0db68dd1f0 100644
--- a/resources/test_data/honeycomb/netconf/triggers.py
+++ b/resources/test_data/honeycomb/netconf/triggers.py
@@ -404,10 +404,10 @@ trigger_revert2 = u"""
<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>
+<type xmlns:v3po="http://fd.io/hc2vpp/yang/v3po">v3po:tap-v2</type>
<enabled>true</enabled>
<tap xmlns="http://fd.io/hc2vpp/yang/v3po">
-<tap-name>tap</tap-name>
+<dev-name>tap</dev-name>
</tap>
</interface>
</interfaces>
@@ -425,10 +425,10 @@ trigger_revert2 = u"""
<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>
+<type xmlns:v3po="http://fd.io/hc2vpp/yang/v3po">v3po:tap-v2</type>
<enabled>true</enabled>
<tap xmlns="http://fd.io/hc2vpp/yang/v3po">
-<tap-name>tap</tap-name>
+<dev-name>tap</dev-name>
</tap>
</interface>
</interfaces>
diff --git a/resources/test_data/honeycomb/persistence.py b/resources/test_data/honeycomb/persistence.py
index 88d2137bae..f4ebdd5f23 100644
--- a/resources/test_data/honeycomb/persistence.py
+++ b/resources/test_data/honeycomb/persistence.py
@@ -44,10 +44,24 @@ def get_variables(interface):
},
# tap interface settings
'tap_interface': 'tap_test',
- 'tap_settings': {'tap-name': 'tap_test',
+ 'tap_interface_vat': 'tap0',
+ 'tap_settings': {'host-interface-name': 'tap_test',
'mac': '08:00:27:c0:5d:37',
- 'device-instance': 1
+ 'id': 1
},
+ 'tap_settings_oper': {'host-interface-name': 'tap_test',
+ 'device-name': 'tap0',
+ 'tx-ring-size': 256,
+ 'rx-ring-size': 256,
+ 'mac': '08:00:27:c0:5d:37',
+ 'id': 1
+ },
+ 'tap_settings_vat': {'dev_name': 'tap0',
+ 'tx_ring_sz': 256,
+ 'rx_ring_sz': 256,
+ 'mac': '08:00:27:c0:5d:37',
+ 'id': 1
+ },
# vhost-user interface settings
'vhost_interface': 'test_vhost',
'vhost_user_client': {'socket': 'soc1',