From c2de0d98ba39e0a1a970d066fd19be786092f376 Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Tue, 1 Mar 2016 16:55:22 +0100 Subject: Imported Upstream version 1.1.91 --- src/settings/plugins/ifcfg-rh/tests/network-scripts/Makefile.am | 2 ++ src/settings/plugins/ifcfg-rh/tests/network-scripts/Makefile.in | 2 ++ .../plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-vlan-flags-2 | 1 - .../ifcfg-rh/tests/network-scripts/ifcfg-test-vlan-interface | 1 - .../ifcfg-rh/tests/network-scripts/ifcfg-test-vlan-reorder-hdr-1 | 3 +-- .../ifcfg-rh/tests/network-scripts/ifcfg-test-vlan-reorder-hdr-2 | 6 ++++++ .../plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-autoip | 5 +++++ 7 files changed, 16 insertions(+), 4 deletions(-) create mode 100644 src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-vlan-reorder-hdr-2 create mode 100644 src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-autoip (limited to 'src/settings/plugins/ifcfg-rh/tests/network-scripts') diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/Makefile.am b/src/settings/plugins/ifcfg-rh/tests/network-scripts/Makefile.am index a1b414fd..36e52af4 100644 --- a/src/settings/plugins/ifcfg-rh/tests/network-scripts/Makefile.am +++ b/src/settings/plugins/ifcfg-rh/tests/network-scripts/Makefile.am @@ -12,6 +12,7 @@ EXTRA_DIST = \ ifcfg-test-wired-shared-plus-ip \ ifcfg-test-wired-dhcp-send-hostname \ ifcfg-test-wired-dhcp6-only \ + ifcfg-test-wired-autoip \ ifcfg-test-wired-global-gateway \ network-test-wired-global-gateway \ ifcfg-test-wired-global-gateway-ignore \ @@ -106,6 +107,7 @@ EXTRA_DIST = \ ifcfg-test-vlan-only-device \ ifcfg-test-vlan-physdev \ ifcfg-test-vlan-reorder-hdr-1 \ + ifcfg-test-vlan-reorder-hdr-2 \ ifcfg-test-vlan-flags-1 \ ifcfg-test-vlan-flags-2 \ ifcfg-test-wifi-wep-no-keys \ diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/Makefile.in b/src/settings/plugins/ifcfg-rh/tests/network-scripts/Makefile.in index cae7067e..2152961c 100644 --- a/src/settings/plugins/ifcfg-rh/tests/network-scripts/Makefile.in +++ b/src/settings/plugins/ifcfg-rh/tests/network-scripts/Makefile.in @@ -408,6 +408,7 @@ EXTRA_DIST = \ ifcfg-test-wired-shared-plus-ip \ ifcfg-test-wired-dhcp-send-hostname \ ifcfg-test-wired-dhcp6-only \ + ifcfg-test-wired-autoip \ ifcfg-test-wired-global-gateway \ network-test-wired-global-gateway \ ifcfg-test-wired-global-gateway-ignore \ @@ -502,6 +503,7 @@ EXTRA_DIST = \ ifcfg-test-vlan-only-device \ ifcfg-test-vlan-physdev \ ifcfg-test-vlan-reorder-hdr-1 \ + ifcfg-test-vlan-reorder-hdr-2 \ ifcfg-test-vlan-flags-1 \ ifcfg-test-vlan-flags-2 \ ifcfg-test-wifi-wep-no-keys \ diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-vlan-flags-2 b/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-vlan-flags-2 index 3b536a66..2c01be71 100644 --- a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-vlan-flags-2 +++ b/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-vlan-flags-2 @@ -3,7 +3,6 @@ TYPE=Vlan DEVICE=super-vlan VLAN_ID=44 PHYSDEV=eth9 -REORDER_HDR=no VLAN_FLAGS="GVRP LOOSE_BINDING" ONBOOT=yes BOOTPROTO=static diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-vlan-interface b/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-vlan-interface index ccd75d7f..d8d9193f 100644 --- a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-vlan-interface +++ b/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-vlan-interface @@ -2,7 +2,6 @@ VLAN=yes TYPE=Vlan DEVICE=vlan43 PHYSDEV=eth9 -REORDER_HDR=0 VLAN_FLAGS=GVRP,LOOSE_BINDING VLAN_INGRESS_PRIORITY_MAP=0:1,2:5 VLAN_EGRESS_PRIORITY_MAP=12:3,14:7,3:1 diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-vlan-reorder-hdr-1 b/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-vlan-reorder-hdr-1 index ca38f839..0dc53971 100644 --- a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-vlan-reorder-hdr-1 +++ b/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-vlan-reorder-hdr-1 @@ -3,5 +3,4 @@ TYPE=Vlan DEVICE=vlan0.3 PHYSDEV=eth0 VLAN_ID=3 -REORDER_HDR=1 - +REORDER_HDR=0 diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-vlan-reorder-hdr-2 b/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-vlan-reorder-hdr-2 new file mode 100644 index 00000000..d98a9d36 --- /dev/null +++ b/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-vlan-reorder-hdr-2 @@ -0,0 +1,6 @@ +VLAN=yes +TYPE=Vlan +DEVICE=vlan0.3 +PHYSDEV=eth0 +VLAN_ID=3 +VLAN_FLAGS="LOOSE_BINDING,NO_REORDER_HDR" diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-autoip b/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-autoip new file mode 100644 index 00000000..dc47126c --- /dev/null +++ b/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-wired-autoip @@ -0,0 +1,5 @@ +TYPE=Ethernet +DEVICE=eth0 +BOOTPROTO=autoip +IPV4_FAILURE_FATAL=yes +PEERDNS=no -- cgit 1.3.0-6-gf8a5