From 270c4830551c9810ad4e83f9a1db2b1cb946208c Mon Sep 17 00:00:00 2001 From: Michael Biebl Date: Sat, 1 Oct 2016 00:33:49 +0200 Subject: New upstream version 1.4.2 --- src/settings/plugins/ifcfg-rh/tests/network-scripts/Makefile.am | 7 +++++-- src/settings/plugins/ifcfg-rh/tests/network-scripts/Makefile.in | 9 ++++++--- .../ifcfg-rh/tests/network-scripts/ifcfg-test-team-master | 6 ------ .../ifcfg-rh/tests/network-scripts/ifcfg-test-team-master-1 | 6 ++++++ .../ifcfg-rh/tests/network-scripts/ifcfg-test-team-master-2 | 5 +++++ .../tests/network-scripts/ifcfg-test-team-master-invalid | 4 ++++ .../plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-team-port | 5 ----- .../ifcfg-rh/tests/network-scripts/ifcfg-test-team-port-1 | 5 +++++ .../ifcfg-rh/tests/network-scripts/ifcfg-test-team-port-2 | 4 ++++ 9 files changed, 35 insertions(+), 16 deletions(-) delete mode 100644 src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-team-master create mode 100644 src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-team-master-1 create mode 100644 src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-team-master-2 create mode 100644 src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-team-master-invalid delete mode 100644 src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-team-port create mode 100644 src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-team-port-1 create mode 100644 src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-team-port-2 (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 fc759e6d..de9c1ed7 100644 --- a/src/settings/plugins/ifcfg-rh/tests/network-scripts/Makefile.am +++ b/src/settings/plugins/ifcfg-rh/tests/network-scripts/Makefile.am @@ -132,8 +132,11 @@ EXTRA_DIST = \ ifcfg-test-dcb-pgpct-not-100 \ ifcfg-test-fcoe-fabric \ ifcfg-test-fcoe-vn2vn \ - ifcfg-test-team-master \ - ifcfg-test-team-port \ + ifcfg-test-team-master-1 \ + ifcfg-test-team-master-2 \ + ifcfg-test-team-master-invalid \ + ifcfg-test-team-port-1 \ + ifcfg-test-team-port-2 \ ifcfg-test-team-port-empty-config \ ifcfg-test-vlan-trailing-spaces \ ifcfg-test-dns-options \ 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 30cc7c05..583f0809 100644 --- a/src/settings/plugins/ifcfg-rh/tests/network-scripts/Makefile.in +++ b/src/settings/plugins/ifcfg-rh/tests/network-scripts/Makefile.in @@ -92,7 +92,7 @@ ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/m4/attributes.m4 \ $(top_srcdir)/m4/ax_lib_readline.m4 \ $(top_srcdir)/m4/compiler_options.m4 \ - $(top_srcdir)/m4/gettext.m4 \ + $(top_srcdir)/m4/gettext.m4 $(top_srcdir)/m4/git-sha-record.m4 \ $(top_srcdir)/m4/gnome-code-coverage.m4 \ $(top_srcdir)/m4/gtk-doc.m4 $(top_srcdir)/m4/iconv.m4 \ $(top_srcdir)/m4/intlmacosx.m4 $(top_srcdir)/m4/intltool.m4 \ @@ -537,8 +537,11 @@ EXTRA_DIST = \ ifcfg-test-dcb-pgpct-not-100 \ ifcfg-test-fcoe-fabric \ ifcfg-test-fcoe-vn2vn \ - ifcfg-test-team-master \ - ifcfg-test-team-port \ + ifcfg-test-team-master-1 \ + ifcfg-test-team-master-2 \ + ifcfg-test-team-master-invalid \ + ifcfg-test-team-port-1 \ + ifcfg-test-team-port-2 \ ifcfg-test-team-port-empty-config \ ifcfg-test-vlan-trailing-spaces \ ifcfg-test-dns-options \ diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-team-master b/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-team-master deleted file mode 100644 index 7edc736a..00000000 --- a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-team-master +++ /dev/null @@ -1,6 +0,0 @@ -DEVICE=team0 -ONBOOT=no -DEVICETYPE=Team -BOOTPROTO=dhcp -TEAM_CONFIG="{ \"device\": \"team0\", \"link_watch\": { \"name\": \"ethtool\" } }" - diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-team-master-1 b/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-team-master-1 new file mode 100644 index 00000000..7edc736a --- /dev/null +++ b/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-team-master-1 @@ -0,0 +1,6 @@ +DEVICE=team0 +ONBOOT=no +DEVICETYPE=Team +BOOTPROTO=dhcp +TEAM_CONFIG="{ \"device\": \"team0\", \"link_watch\": { \"name\": \"ethtool\" } }" + diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-team-master-2 b/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-team-master-2 new file mode 100644 index 00000000..d01e37c5 --- /dev/null +++ b/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-team-master-2 @@ -0,0 +1,5 @@ +DEVICE=team0 +ONBOOT=no +BOOTPROTO=dhcp +TEAM_CONFIG="{ \"device\": \"team0\", \"link_watch\": { \"name\": \"ethtool\" } }" + diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-team-master-invalid b/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-team-master-invalid new file mode 100644 index 00000000..4534882e --- /dev/null +++ b/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-team-master-invalid @@ -0,0 +1,4 @@ +DEVICE=team0 +ONBOOT=no +BOOTPROTO=dhcp +TEAM_CONFIG="{ foobar }" diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-team-port b/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-team-port deleted file mode 100644 index 966bec67..00000000 --- a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-team-port +++ /dev/null @@ -1,5 +0,0 @@ -TYPE=Ethernet -TEAM_PORT_CONFIG="{ \"p4p1\": { \"prio\": -10, \"sticky\": true } }" -DEVICE=p4p1 -TEAM_MASTER=team0 -DEVICETYPE=TeamPort diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-team-port-1 b/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-team-port-1 new file mode 100644 index 00000000..966bec67 --- /dev/null +++ b/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-team-port-1 @@ -0,0 +1,5 @@ +TYPE=Ethernet +TEAM_PORT_CONFIG="{ \"p4p1\": { \"prio\": -10, \"sticky\": true } }" +DEVICE=p4p1 +TEAM_MASTER=team0 +DEVICETYPE=TeamPort diff --git a/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-team-port-2 b/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-team-port-2 new file mode 100644 index 00000000..992510ee --- /dev/null +++ b/src/settings/plugins/ifcfg-rh/tests/network-scripts/ifcfg-test-team-port-2 @@ -0,0 +1,4 @@ +TYPE=Ethernet +TEAM_PORT_CONFIG="{ \"p4p1\": { \"prio\": -10, \"sticky\": true } }" +DEVICE=p4p1 +TEAM_MASTER=team0 -- cgit 1.3.0-6-gf8a5