Notification time stamped 2021-04-30 14:47:19 UTC
From d6c0b0c428788f29a2511286cdfa0d09a88b50dc Mon Sep 17 00:00:00 2001
From: Rich Megginson <rmeggins(a)redhat.com>
Date: Apr 28 2021 14:57:09 +0000
Subject: rebase network role to latest upstream
Resolves: rhbz#1937938
Resolves: rhbz#1939711
support for ipv6_disabled to disable ipv6 for address
---
diff --git a/linux-system-roles.spec b/linux-system-roles.spec
index 9c6d8e7..db55a99 100644
--- a/linux-system-roles.spec
+++ b/linux-system-roles.spec
@@ -113,7 +113,7 @@ BuildRequires: ansible >= 2.9.10
%global rolename4 kdump
#%%deftag 4 1.0.0
-%defcommit 5 bda206d45c87ee8c1a5284de84f5acf5e629de97
+%defcommit 5 0f5a882bcab58baba527015b7cde01c7c52d2254
%global rolename5 network
#%%deftag 5 1.0.0
@@ -201,11 +201,9 @@ Patch44: kdump-fix-newline.diff
Patch51: network-epel-minimal.diff
# Not suitable for upstream, since the files need to be executable there
-Patch52: network-permissions.diff
-Patch53: network-tier1-tags.diff
-Patch55: network-disable-bondtests.diff
-Patch56: network-pr353.diff
-Patch57: network-ansible-test.diff
+Patch52: network-tier1-tags.diff
+Patch53: network-disable-bondtests.diff
+Patch54: network-ansible-test.diff
Patch61: storage-ansible-test.diff
@@ -284,9 +282,7 @@ cd %{rolename5}
%patch51 -p1
%patch52 -p1
%patch53 -p1
-%patch55 -p1
-%patch56 -p1
-%patch57 -p1
+%patch54 -p1
cd ..
cd %{rolename6}
%patch61 -p1
diff --git a/network-ansible-test.diff b/network-ansible-test.diff
index 8f88e21..f8de3cf 100644
--- a/network-ansible-test.diff
+++ b/network-ansible-test.diff
@@ -1,30 +1,8 @@
-From 7ae16e9ff5291f06ba0d7224a0d6c36b780ea0a2 Mon Sep 17 00:00:00 2001
+From c0297506cee0d615f44e52b7c826cd83916eba08 Mon Sep 17 00:00:00 2001
From: Rich Megginson <rmeggins(a)redhat.com>
-Date: Wed, 3 Mar 2021 11:37:56 -0700
-Subject: [PATCH] fix most ansible-test issues, suppress the rest
+Date: Thu, 25 Mar 2021 13:58:03 -0600
+Subject: [PATCH 4/4] Patch54: network-ansible-test.diff
-Automation Hub, and possibly Galaxy in the future, require the
-collection to be screened with `ansible-test sanity` among other
-checks. The role had a number of issues:
-* Use `AssertionError` instead of `assert`
-* Use of `logging` module not in accordance with standards, but these
- are ok and the errors were suppressed
-* Several import errors which are ok because they are checked
- elsewhere
-* Many of the module files use `#!` shebang - not sure why, but
- the usage is allowed
-* __init__.py in the module_utils directories must be empty, so a
- new file myerror.py was added to move the code from __init__.py
-* The documentation block in the module was not properly constructed
- or formatted.
-* shellcheck issues, including removing unused files
-* use `dummy` instead of `_` (underscore) for variables that are
- unused
-
-add WARNING to module docs - collection users should not use directly
-
-Signed-off-by: Rich Megginson <rmeggins(a)redhat.com>
-(cherry picked from commit 7459a29e9104bf01987399153baf0a1c1df05929)
---
.github/workflows/tox.yml | 4 +-
.sanity-ansible-ignore-2.9.txt | 47 ++++++++++
@@ -130,7 +108,7 @@ index 0000000..439197e
+plugins/modules/network_connections.py validate-modules:parameter-type-not-in-doc
+plugins/modules/network_connections.py validate-modules:undocumented-parameter
diff --git a/README.md b/README.md
-index c1462b6..c257c08 100644
+index 06a8b1b..48bb5bc 100644
--- a/README.md
+++ b/README.md
@@ -145,7 +145,7 @@ a consequence, `state: up` always changes the system.
@@ -143,7 +121,7 @@ index c1462b6..c257c08 100644
### `persistent_state`
diff --git a/library/network_connections.py b/library/network_connections.py
-index 3224892..3a6e47f 100644
+index dc30ae8..32ebec9 100644
--- a/library/network_connections.py
+++ b/library/network_connections.py
@@ -2,6 +2,30 @@
@@ -218,7 +196,7 @@ index 3224892..3a6e47f 100644
def connection_is_active(self, con):
NM = Util.NM()
-@@ -1390,7 +1398,7 @@ class RunEnvironment(object):
+@@ -1399,7 +1407,7 @@ class RunEnvironment(object):
def check_mode_set(self, check_mode, connections=None):
c = self._check_mode
self._check_mode = check_mode
@@ -227,7 +205,7 @@ index 3224892..3a6e47f 100644
(c is None and check_mode in [CheckMode.PREPARE])
or (
c == CheckMode.PREPARE
-@@ -1399,7 +1407,8 @@ class RunEnvironment(object):
+@@ -1408,7 +1416,8 @@ class RunEnvironment(object):
or (c == CheckMode.PRE_RUN and check_mode in [CheckMode.REAL_RUN])
or (c == CheckMode.REAL_RUN and check_mode in [CheckMode.DONE])
or (c == CheckMode.DRY_RUN and check_mode in [CheckMode.DONE])
@@ -237,7 +215,7 @@ index 3224892..3a6e47f 100644
self._check_mode_changed(c, check_mode, connections)
-@@ -1461,7 +1470,8 @@ class RunEnvironmentAnsible(RunEnvironment):
+@@ -1470,7 +1479,8 @@ class RunEnvironmentAnsible(RunEnvironment):
warn_traceback=False,
force_fail=False,
):
@@ -247,7 +225,7 @@ index 3224892..3a6e47f 100644
self._log_idx += 1
self.run_results[idx]["log"].append((severity, msg, self._log_idx))
if severity == LogLevel.ERROR:
-@@ -1598,14 +1608,15 @@ class Cmd(object):
+@@ -1607,14 +1617,15 @@ class Cmd(object):
def connections_data(self):
c = self._connections_data
if c is None:
@@ -268,7 +246,7 @@ index 3224892..3a6e47f 100644
self._connections_data = c
return c
-@@ -1614,11 +1625,14 @@ class Cmd(object):
+@@ -1623,11 +1634,14 @@ class Cmd(object):
c["changed"] = False
def connections_data_set_changed(self, idx, changed=True):
@@ -285,7 +263,7 @@ index 3224892..3a6e47f 100644
if not changed:
return
self.connections_data[idx]["changed"] = changed
-@@ -1688,7 +1702,10 @@ class Cmd(object):
+@@ -1697,7 +1711,10 @@ class Cmd(object):
# modify the connection.
con = self.connections[idx]
@@ -297,7 +275,7 @@ index 3224892..3a6e47f 100644
# also check, if the current profile is 'up' with a 'type'
(which
# possibly modifies the connection as well)
-@@ -1736,7 +1753,9 @@ class Cmd(object):
+@@ -1745,7 +1762,9 @@ class Cmd(object):
elif self._check_mode != CheckMode.DONE:
c = CheckMode.DONE
else:
@@ -308,7 +286,7 @@ index 3224892..3a6e47f 100644
self._check_mode = c
self.run_env.check_mode_set(c)
return c
-@@ -1902,7 +1921,12 @@ class Cmd_nm(Cmd):
+@@ -1911,7 +1930,12 @@ class Cmd_nm(Cmd):
name = connection["name"]
if not name:
@@ -322,7 +300,7 @@ index 3224892..3a6e47f 100644
continue
if name in names:
exists = names[name]["nm.exists"]
-@@ -1979,7 +2003,7 @@ class Cmd_nm(Cmd):
+@@ -1988,7 +2012,7 @@ class Cmd_nm(Cmd):
idx, "ethtool.%s specified but not supported by NM",
specified
)
@@ -344,7 +322,7 @@ index 22c717c..e69de29 100644
-class MyError(Exception):
- pass
diff --git a/module_utils/network_lsr/argument_validator.py
b/module_utils/network_lsr/argument_validator.py
-index 24ffdc4..f338489 100644
+index 1bfaeda..a6ed937 100644
--- a/module_utils/network_lsr/argument_validator.py
+++ b/module_utils/network_lsr/argument_validator.py
@@ -2,12 +2,16 @@
@@ -668,10 +646,10 @@ index 73d9528..bc258fe 100644
i = 2
b.append(n)
diff --git a/tests/ensure_provider_tests.py b/tests/ensure_provider_tests.py
-index 3620729..4e45e6a 100755
+index 078e99d..c22dbce 100755
--- a/tests/ensure_provider_tests.py
+++ b/tests/ensure_provider_tests.py
-@@ -73,8 +73,6 @@ NM_ONLY_TESTS = {
+@@ -76,8 +76,6 @@ NM_ONLY_TESTS = {
MINIMUM_VERSION: "'1.25.1'",
"comment": "# NetworkManager 1.25.1 introduced ethtool coalesce
support",
},
@@ -680,7 +658,7 @@ index 3620729..4e45e6a 100755
"playbooks/tests_reapply.yml": {},
# team interface is not supported on Fedora
"playbooks/tests_team.yml": {
-@@ -117,9 +115,7 @@ def create_nm_playbook(test_playbook):
+@@ -122,9 +120,7 @@ def create_nm_playbook(test_playbook):
EXTRA_RUN_CONDITION, ""
)
if extra_run_condition:
@@ -691,7 +669,7 @@ index 3620729..4e45e6a 100755
nm_version_check = ""
if minimum_nm_version:
-@@ -212,7 +208,7 @@ def main():
+@@ -217,7 +213,7 @@ def main():
if missing:
print("ERROR: No NM or initscripts tests found for:\n" + ",
\n".join(missing))
diff --git a/network-disable-bondtests.diff b/network-disable-bondtests.diff
index 086edd4..d399917 100644
--- a/network-disable-bondtests.diff
+++ b/network-disable-bondtests.diff
@@ -1,18 +1,43 @@
+From d6c8319f52f3859b28044841063adf0013df878b Mon Sep 17 00:00:00 2001
+From: Rich Megginson <rmeggins(a)redhat.com>
+Date: Thu, 25 Mar 2021 13:57:45 -0600
+Subject: [PATCH 3/4] Patch53: network-disable-bondtests.diff
+
+---
+ tests/playbooks/tests_bond.yml | 2 ++
+ tests/playbooks/tests_bond_deprecated.yml | 2 ++
+ tests/tests_bond_deprecated_initscripts.yml | 1 +
+ tests/tests_bond_initscripts.yml | 1 +
+ 4 files changed, 6 insertions(+)
+
diff --git a/tests/playbooks/tests_bond.yml b/tests/playbooks/tests_bond.yml
-index d646a0b..8689d59 100644
+index 1e45788..d3005a6 100644
+--- a/tests/playbooks/tests_bond.yml
++++ b/tests/playbooks/tests_bond.yml
+@@ -13,6 +13,8 @@
+ dhcp_interface1: test1
+ port2_profile: bond0.1
+ dhcp_interface2: test2
++ tags:
++ - "tests::expfail"
+ tasks:
+ - name: "INIT Prepare setup"
+ debug:
+diff --git a/tests/playbooks/tests_bond_deprecated.yml
b/tests/playbooks/tests_bond_deprecated.yml
+index f37e19a..ae475c4 100644
--- a/tests/playbooks/tests_bond_deprecated.yml
+++ b/tests/playbooks/tests_bond_deprecated.yml
@@ -8,6 +8,8 @@
dhcp_interface1: test1
- slave2_profile: bond0.1
+ port2_profile: bond0.1
dhcp_interface2: test2
+ tags:
+ - "tests::expfail"
tasks:
- name: "INIT Prepare setup"
debug:
-diff --git a/tests/tests_bond_initscripts.yml b/tests/tests_bond_initscripts.yml
-index 8fa74c5..6a231c4 100644
+diff --git a/tests/tests_bond_deprecated_initscripts.yml
b/tests/tests_bond_deprecated_initscripts.yml
+index 383b488..cdf3de0 100644
--- a/tests/tests_bond_deprecated_initscripts.yml
+++ b/tests/tests_bond_deprecated_initscripts.yml
@@ -9,5 +9,6 @@
@@ -22,19 +47,6 @@ index 8fa74c5..6a231c4 100644
+ - "tests::expfail"
- import_playbook: playbooks/tests_bond_deprecated.yml
-diff --git a/tests/playbooks/tests_bond.yml b/tests/playbooks/tests_bond.yml
-index d646a0b..8689d59 100644
---- a/tests/playbooks/tests_bond.yml
-+++ b/tests/playbooks/tests_bond.yml
-@@ -13,6 +13,8 @@
- dhcp_interface1: test1
- port2_profile: bond0.1
- dhcp_interface2: test2
-+ tags:
-+ - "tests::expfail"
- tasks:
- - name: "INIT Prepare setup"
- debug:
diff --git a/tests/tests_bond_initscripts.yml b/tests/tests_bond_initscripts.yml
index 8fa74c5..6a231c4 100644
--- a/tests/tests_bond_initscripts.yml
@@ -46,3 +58,6 @@ index 8fa74c5..6a231c4 100644
+ - "tests::expfail"
- import_playbook: playbooks/tests_bond.yml
+--
+2.30.2
+
diff --git a/network-epel-minimal.diff b/network-epel-minimal.diff
index af8b0ef..21e7671 100644
--- a/network-epel-minimal.diff
+++ b/network-epel-minimal.diff
@@ -1,3 +1,42 @@
+From 88189e32ab6ab4491430584e8c162c9c42d6ca47 Mon Sep 17 00:00:00 2001
+From: Rich Megginson <rmeggins(a)redhat.com>
+Date: Thu, 25 Mar 2021 13:55:01 -0600
+Subject: [PATCH 1/4] Patch51: network-epel-minimal.diff
+
+---
+ .../playbooks/integration_pytest_python3.yml | 5 ++++
+ tests/tasks/el_repo_setup.yml | 26 -------------------
+ tests/tasks/setup_802_1x_server.yml | 2 ++
+ tests/tasks/setup_mock_wifi.yml | 2 ++
+ tests/tests_802_1x_nm.yml | 1 -
+ tests/tests_802_1x_updated_nm.yml | 1 -
+ tests/tests_bond_deprecated_initscripts.yml | 1 -
+ tests/tests_bond_initscripts.yml | 1 -
+ tests/tests_bond_nm.yml | 1 -
+ tests/tests_bridge_initscripts.yml | 1 -
+ tests/tests_bridge_nm.yml | 1 -
+ tests/tests_default.yml | 1 -
+ tests/tests_default_initscripts.yml | 1 -
+ tests/tests_default_nm.yml | 1 -
+ tests/tests_ethernet_initscripts.yml | 2 --
+ tests/tests_ethernet_nm.yml | 2 --
+ tests/tests_ethtool_features_initscripts.yml | 1 -
+ tests/tests_ethtool_features_nm.yml | 2 --
+ tests/tests_helpers_and_asserts.yml | 2 --
+ tests/tests_integration_pytest.yml | 5 ++--
+ tests/tests_provider_nm.yml | 2 --
+ tests/tests_reapply_nm.yml | 2 --
+ tests/tests_regression_nm.yml | 2 --
+ tests/tests_states_initscripts.yml | 2 --
+ tests/tests_states_nm.yml | 2 --
+ tests/tests_team_nm.yml | 2 --
+ tests/tests_unit.yml | 2 +-
+ tests/tests_vlan_mtu_initscripts.yml | 2 --
+ tests/tests_vlan_mtu_nm.yml | 2 --
+ tests/tests_wireless_nm.yml | 2 --
+ 30 files changed, 12 insertions(+), 67 deletions(-)
+ delete mode 100644 tests/tasks/el_repo_setup.yml
+
diff --git a/tests/playbooks/integration_pytest_python3.yml
b/tests/playbooks/integration_pytest_python3.yml
index 075355b..5fc9dea 100644
--- a/tests/playbooks/integration_pytest_python3.yml
@@ -399,3 +438,6 @@ index 03b5ad6..86baf67 100644
- name: Set network provider to 'nm'
set_fact:
network_provider: nm
+--
+2.30.2
+
diff --git a/network-permissions.diff b/network-permissions.diff
deleted file mode 100644
index 05068ff..0000000
--- a/network-permissions.diff
+++ /dev/null
@@ -1,6 +0,0 @@
-diff --git a/library/network_connections.py b/library/network_connections.py
-old mode 100755
-new mode 100644
-diff --git a/tests/unit/test_network_connections.py
b/tests/unit/test_network_connections.py
-old mode 100755
-new mode 100644
diff --git a/network-pr353.diff b/network-pr353.diff
deleted file mode 100644
index e4398b7..0000000
--- a/network-pr353.diff
+++ /dev/null
@@ -1,35 +0,0 @@
-From f4fabea55429077c2a4e94fe8015c4ab57f58ff3 Mon Sep 17 00:00:00 2001
-From: Fernando Fernandez Mancera <ffmancera(a)riseup.net>
-Date: Mon, 15 Feb 2021 11:02:55 +0100
-Subject: [PATCH] README: remove "slaves" leftover from documentation
-
-Signed-off-by: Fernando Fernandez Mancera <ffmancera(a)riseup.net>
----
- README.md | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/README.md b/README.md
-index 6b15673..06a8b1b 100644
---- a/README.md
-+++ b/README.md
-@@ -300,7 +300,7 @@ different or the profile may not be tied to an interface at all.
-
- The `zone` option sets the firewalld zone for the interface.
-
--Slaves to the bridge, bond or team devices cannot specify a zone.
-+Ports to the bridge, bond or team devices cannot specify a zone.
-
-
- ### `ip`
-@@ -367,7 +367,7 @@ The IP configuration supports the following options:
-
- **Note:** When `route_append_only` or `rule_append_only` is not specified, the `network`
role deletes the current routes or routing rules.
-
--**Note:** Slaves to the bridge, bond or team devices cannot specify `ip` settings.
-+**Note:** Ports to the bridge, bond or team devices cannot specify `ip` settings.
-
- ### `ethtool`
-
---
-2.29.2
-
diff --git a/network-tier1-tags.diff b/network-tier1-tags.diff
index 1c4cb67..3fff8a1 100644
--- a/network-tier1-tags.diff
+++ b/network-tier1-tags.diff
@@ -1,3 +1,36 @@
+From c050984fda1e5bed1882335c30108b402b55b795 Mon Sep 17 00:00:00 2001
+From: Rich Megginson <rmeggins(a)redhat.com>
+Date: Thu, 25 Mar 2021 13:55:52 -0600
+Subject: [PATCH 2/4] Patch52: network-tier1-tags.diff
+
+---
+ tests/playbooks/tests_802_1x.yml | 10 ++++++++
+ tests/playbooks/tests_bond.yml | 10 ++++++++
+ tests/playbooks/tests_bridge.yml | 27 +++++++++++++++++++-
+ tests/playbooks/tests_checkpoint_cleanup.yml | 10 ++++++++
+ tests/playbooks/tests_ethernet.yml | 21 +++++++++++++++
+ tests/playbooks/tests_ethtool_features.yml | 10 ++++++++
+ tests/playbooks/tests_provider.yml | 10 ++++++++
+ tests/playbooks/tests_reapply.yml | 10 ++++++++
+ tests/playbooks/tests_states.yml | 20 +++++++++++++++
+ tests/playbooks/tests_vlan_mtu.yml | 18 +++++++++++++
+ tests/playbooks/tests_wireless.yml | 10 ++++++++
+ tests/tasks/commonvars.yml | 2 ++
+ tests/tasks/get_services_state.yml | 4 +++
+ tests/tasks/restore_services_state.yml | 22 ++++++++++++++++
+ tests/tasks/restore_state.yml | 24 +++++++++++++++++
+ tests/tasks/save_state.yml | 11 ++++++++
+ tests/tests_802_1x_nm.yml | 4 +++
+ tests/tests_802_1x_updated_nm.yml | 4 +++
+ tests/tests_default.yml | 8 ++++++
+ tests/tests_helpers_and_asserts.yml | 8 ++++++
+ 20 files changed, 242 insertions(+), 1 deletion(-)
+ create mode 100644 tests/tasks/commonvars.yml
+ create mode 100644 tests/tasks/get_services_state.yml
+ create mode 100644 tests/tasks/restore_services_state.yml
+ create mode 100644 tests/tasks/restore_state.yml
+ create mode 100644 tests/tasks/save_state.yml
+
diff --git a/tests/playbooks/tests_802_1x.yml b/tests/playbooks/tests_802_1x.yml
index 9cce1ae..76d99e9 100644
--- a/tests/playbooks/tests_802_1x.yml
@@ -529,3 +562,6 @@ index 5514182..d9bfa11 100644
# FIXME: when: does not seem to work with include_tasks, therefore this cannot
# be safely tested for now
# - name: test tap interfaces
+--
+2.30.2
+
https://src.fedoraproject.org/rpms/linux-system-roles/c/d6c0b0c428788f29a...