X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=tests%2Finterface-reconfigure.at;h=ad702637437c3c36df565e7c2548311a2b01f0d0;hb=0b420b100ac540d45a45e45d40e6581b0c5f7eb5;hp=9b47838265d496013d1ea46b23e518891bbf3515;hpb=27b1bdef46dffa58967991682842d2cd248ad16e;p=openvswitch

diff --git a/tests/interface-reconfigure.at b/tests/interface-reconfigure.at
index 9b478382..ad702637 100644
--- a/tests/interface-reconfigure.at
+++ b/tests/interface-reconfigure.at
@@ -73,6 +73,7 @@ EOF
 <xenserver-network-configuration>
 	<pif ref="OpaqueRef:e0955887-571f-17fc-a971-61c1ec7d81b6">
 		<VLAN_slave_of/>
+                <tunnel_access_PIF_of/>
 		<management>
 			False
 		</management>
@@ -120,6 +121,7 @@ EOF
 	</pif>
 	<pif ref="OpaqueRef:eea8da94-a5e6-18fc-34a7-5e9b5a235806">
 		<VLAN_slave_of/>
+                <tunnel_access_PIF_of/>
 		<management>
 			False
 		</management>
@@ -167,6 +169,7 @@ EOF
 	</pif>
 	<pif ref="OpaqueRef:2956e6c8-487e-981c-85ff-c84796418768">
 		<VLAN_slave_of/>
+                <tunnel_access_PIF_of/>
 		<management>
 			False
 		</management>
@@ -214,6 +217,7 @@ EOF
 	</pif>
 	<pif ref="OpaqueRef:d2d1e51e-4da9-3163-8f57-bb683429335e">
 		<VLAN_slave_of/>
+                <tunnel_access_PIF_of/>
 		<management>
 			False
 		</management>
@@ -265,6 +269,7 @@ EOF
 				OpaqueRef:e623e1d6-cd02-be8d-820d-49d65c710297
 			</master>
 		</VLAN_slave_of>
+                <tunnel_access_PIF_of/>
 		<management>
 			False
 		</management>
@@ -312,6 +317,7 @@ EOF
 	</pif>
 	<pif ref="OpaqueRef:205d1186-2cd1-d5e6-45e4-ea1698ea6e15">
 		<VLAN_slave_of/>
+                <tunnel_access_PIF_of/>
 		<management>
 			True
 		</management>
@@ -359,6 +365,7 @@ EOF
 	</pif>
 	<pif ref="OpaqueRef:8e3e37e6-ebb9-087e-0201-f6a56bf554c3">
 		<VLAN_slave_of/>
+                <tunnel_access_PIF_of/>
 		<management>
 			False
 		</management>
@@ -410,6 +417,7 @@ EOF
 				OpaqueRef:4c0eb823-4d96-da1d-e75f-411b85badb0c
 			</master>
 		</VLAN_slave_of>
+                <tunnel_access_PIF_of/>
 		<management>
 			False
 		</management>
@@ -656,6 +664,7 @@ Applying changes to /etc/sysconfig/network-scripts/route-xenbr2 configuration
 Applying changes to /etc/sysconfig/network configuration
 Applying changes to /etc/sysconfig/network-scripts/ifcfg-xenbr2 configuration
 /sbin/ifconfig eth2 up mtu 1500
+/sbin/ethtool -K eth2 gro off lro off
 /usr/bin/ovs-vsctl --timeout=20
     --with-iface --if-exists del-port eth2
     --may-exist add-br xenbr2
@@ -720,6 +729,7 @@ configure_datapath: extra bonds - []
 Applying changes to /etc/sysconfig/network-scripts/route-xapi3 configuration
 Applying changes to /etc/sysconfig/network-scripts/ifcfg-xapi3 configuration
 /sbin/ifconfig eth3 up mtu 1500
+/sbin/ethtool -K eth3 gro off lro off
 /usr/bin/ovs-vsctl --timeout=20
     --with-iface --if-exists del-port eth3
     --may-exist add-br xenbr3
@@ -727,7 +737,6 @@ Applying changes to /etc/sysconfig/network-scripts/ifcfg-xapi3 configuration
     set Bridge xenbr3 other-config:hwaddr="00:15:17:a0:29:81"
     set Bridge xenbr3 fail_mode=standalone
     br-set-external-id xenbr3 xs-network-uuids 2902ae1b-8013-897a-b697-0b200ea3aaa5;db7bdc03-074d-42ae-fc73-9b06de1d57f6
-    --if-exists del-br xapi3
     --may-exist add-br xapi3 xenbr3 123
     br-set-external-id xapi3 xs-network-uuids 2902ae1b-8013-897a-b697-0b200ea3aaa5;db7bdc03-074d-42ae-fc73-9b06de1d57f6
     set Interface xapi3 MAC="00:15:17:a0:29:81"
@@ -800,7 +809,9 @@ netdev: down: device xenbr1 does not exist, ignoring
 Applying changes to /etc/sysconfig/network-scripts/route-xapi1 configuration
 Applying changes to /etc/sysconfig/network-scripts/ifcfg-xapi1 configuration
 /sbin/ifconfig eth0 up mtu 1500
+/sbin/ethtool -K eth0 gro off lro off
 /sbin/ifconfig eth1 up mtu 1500
+/sbin/ethtool -K eth1 gro off lro off
 /usr/bin/ovs-vsctl --timeout=20
     --if-exists del-br xenbr0
     --if-exists del-br xenbr1
@@ -809,7 +820,7 @@ Applying changes to /etc/sysconfig/network-scripts/ifcfg-xapi1 configuration
     --may-exist add-br xapi1
     --with-iface --if-exists del-port bond0
     --fake-iface add-bond xapi1 bond0 eth0 eth1
-    set Port bond0 MAC="00:22:19:22:4b:af" bond_downdelay=200 other-config:bond-miimon-interval=100 other-config:bond-detect-mode=carrier bond_mode=balance-slb bond_updelay=31000
+    set Port bond0 MAC="00:22:19:22:4b:af" other-config:bond-miimon-interval=100 bond_downdelay=200 bond_updelay=31000 other-config:bond-detect-mode=carrier lacp=off bond_mode=balance-slb
     set Bridge xapi1 other-config:hwaddr="00:22:19:22:4b:af"
     set Bridge xapi1 fail_mode=standalone
     br-set-external-id xapi1 xs-network-uuids 45cbbb43-113d-a712-3231-c6463f253cef;99be2da4-6c33-6f8e-49ea-3bc592fe3c85
@@ -882,7 +893,9 @@ netdev: down: device xenbr1 does not exist, ignoring
 Applying changes to /etc/sysconfig/network-scripts/route-xapi2 configuration
 Applying changes to /etc/sysconfig/network-scripts/ifcfg-xapi2 configuration
 /sbin/ifconfig eth0 up mtu 1500
+/sbin/ethtool -K eth0 gro off lro off
 /sbin/ifconfig eth1 up mtu 1500
+/sbin/ethtool -K eth1 gro off lro off
 /usr/bin/ovs-vsctl --timeout=20
     --if-exists del-br xenbr0
     --if-exists del-br xenbr1
@@ -891,11 +904,10 @@ Applying changes to /etc/sysconfig/network-scripts/ifcfg-xapi2 configuration
     --may-exist add-br xapi1
     --with-iface --if-exists del-port bond0
     --fake-iface add-bond xapi1 bond0 eth0 eth1
-    set Port bond0 MAC="00:22:19:22:4b:af" bond_downdelay=200 other-config:bond-miimon-interval=100 other-config:bond-detect-mode=carrier bond_mode=balance-slb bond_updelay=31000
+    set Port bond0 MAC="00:22:19:22:4b:af" other-config:bond-miimon-interval=100 bond_downdelay=200 bond_updelay=31000 other-config:bond-detect-mode=carrier lacp=off bond_mode=balance-slb
     set Bridge xapi1 other-config:hwaddr="00:22:19:22:4b:af"
     set Bridge xapi1 fail_mode=standalone
     br-set-external-id xapi1 xs-network-uuids 45cbbb43-113d-a712-3231-c6463f253cef;99be2da4-6c33-6f8e-49ea-3bc592fe3c85
-    --if-exists del-br xapi2
     --may-exist add-br xapi2 xapi1 4
     br-set-external-id xapi2 xs-network-uuids 45cbbb43-113d-a712-3231-c6463f253cef;99be2da4-6c33-6f8e-49ea-3bc592fe3c85
     set Interface xapi2 MAC="00:22:19:22:4b:af"