Merged update from upstream sources
This is an automated DistroBaker update from upstream sources. If you do not know what this is about or would like to opt out, contact the OSCI team. Source: https://src.fedoraproject.org/rpms/nispor.git#2cdf08cea3d4101b75799688dd053c642e5c417d
This commit is contained in:
parent
de59af5d7f
commit
0480827e67
1
.gitignore
vendored
1
.gitignore
vendored
@ -3,3 +3,4 @@
|
||||
/nispor-0.5.1.tar.gz
|
||||
/nispor-0.6.1.tar.gz
|
||||
/nispor-1.0.0.tar.gz
|
||||
/nispor-1.0.1.tar.gz
|
||||
|
@ -1,58 +0,0 @@
|
||||
From 674d186570f98fecc24248c9879473346a321225 Mon Sep 17 00:00:00 2001
|
||||
From: Fernando Fernandez Mancera <ffmancera@riseup.net>
|
||||
Date: Mon, 9 Nov 2020 12:16:31 +0100
|
||||
Subject: [PATCH] python: use snake_case interface types
|
||||
|
||||
Signed-off-by: Fernando Fernandez Mancera <ffmancera@riseup.net>
|
||||
Signed-off-by: Gris Ge <fge@redhat.com>
|
||||
---
|
||||
src/python/nispor/iface.py | 22 +++++++++++-----------
|
||||
1 file changed, 11 insertions(+), 11 deletions(-)
|
||||
|
||||
diff --git a/src/python/nispor/iface.py b/src/python/nispor/iface.py
|
||||
index 4dbcc46..26eb84b 100644
|
||||
--- a/src/python/nispor/iface.py
|
||||
+++ b/src/python/nispor/iface.py
|
||||
@@ -54,28 +54,28 @@ class NisporIfaceState:
|
||||
def _iface_info_to_obj(iface_info):
|
||||
iface_type = iface_info["iface_type"]
|
||||
ctrl_type = iface_info.get("controller_type")
|
||||
- if iface_type == "Bond":
|
||||
+ if iface_type == "bond":
|
||||
iface = NisporBond(iface_info)
|
||||
- elif iface_type == "Bridge":
|
||||
+ elif iface_type == "bridge":
|
||||
iface = NisporBridge(iface_info)
|
||||
- elif iface_type == "Tun":
|
||||
+ elif iface_type == "tun":
|
||||
iface = NisporTun(iface_info)
|
||||
- elif iface_type == "Vlan":
|
||||
+ elif iface_type == "vlan":
|
||||
iface = NisporVlan(iface_info)
|
||||
- elif iface_type == "Vxlan":
|
||||
+ elif iface_type == "vxlan":
|
||||
iface = NisporVxlan(iface_info)
|
||||
- elif iface_type == "Veth":
|
||||
+ elif iface_type == "veth":
|
||||
iface = NisporVeth(iface_info)
|
||||
- elif iface_type == "Vrf":
|
||||
+ elif iface_type == "vrf":
|
||||
iface = NisporVRF(iface_info)
|
||||
- elif iface_type == "MacVlan":
|
||||
+ elif iface_type == "mac_vlan":
|
||||
iface = NisporMacVlan(iface_info)
|
||||
- elif iface_type == "MacVtap":
|
||||
+ elif iface_type == "mac_vtap":
|
||||
iface = NisporMacVtap(iface_info)
|
||||
else:
|
||||
iface = NisporBaseIface(iface_info)
|
||||
- if ctrl_type == "Bond":
|
||||
+ if ctrl_type == "bond":
|
||||
iface.subordinate_state = NisporBondSubordinate(iface_info)
|
||||
- elif ctrl_type == "Bridge":
|
||||
+ elif ctrl_type == "bridge":
|
||||
iface.subordinate_state = NisporBridgePort(iface_info)
|
||||
return iface
|
||||
--
|
||||
2.29.2
|
||||
|
@ -2,13 +2,12 @@
|
||||
%bcond_with check
|
||||
|
||||
Name: nispor
|
||||
Version: 1.0.0
|
||||
Release: 2%{?dist}
|
||||
Version: 1.0.1
|
||||
Release: 1%{?dist}
|
||||
Summary: Unified interface for Linux network state querying
|
||||
License: ASL 2.0
|
||||
URL: https://github.com/nispor/nispor
|
||||
Source: https://github.com/nispor/nispor/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.gz
|
||||
Patch1: 0001-python-use-snake_case-interface-types.patch
|
||||
ExclusiveArch: %{rust_arches}
|
||||
BuildRequires: pkg-config
|
||||
BuildRequires: python3-devel
|
||||
@ -149,6 +148,9 @@ popd
|
||||
%systemd_postun_with_restart nispor.service
|
||||
|
||||
%changelog
|
||||
* Tue Nov 10 2020 Fernando Fernandez Mancera <ferferna@redhat.com> - 1.0.1-1
|
||||
- Upgrade to 1.0.1
|
||||
|
||||
* Mon Nov 09 2020 Gris Ge <fge@redhat.com> - 1.0.0-2
|
||||
- Fix iface type of python bonding
|
||||
|
||||
|
2
sources
2
sources
@ -1 +1 @@
|
||||
SHA512 (nispor-1.0.0.tar.gz) = 927b837e89abf86594e2056843b064f14dd69dc229876540db75cbca29620c2a292adce178802a12dfec900da1fa244ad532a2309deb76c41296b810dab06c15
|
||||
SHA512 (nispor-1.0.1.tar.gz) = 11b4ff7a895951bce04c9d03721634d9270985fbf60676d64583c33f8702ff69136c573eaf24a6aebe5ea852278e2271f5fbdfa6823be23699be917a648fc3a3
|
||||
|
Loading…
Reference in New Issue
Block a user