diff options
| author | Paul Holzinger <paul.holzinger@web.de> | 2021-03-15 10:45:24 +0100 |
|---|---|---|
| committer | Paul Holzinger <paul.holzinger@web.de> | 2021-03-15 14:01:52 +0100 |
| commit | 762148deb6be6925d17bd12f219f7385e1402439 (patch) | |
| tree | 9efd0b493ce2e590cb79960507b1a4d9ec967189 /libpod/network/netconflist.go | |
| parent | fc02d16e728dfdd5a5f2e3bc622bbceb7f8c0d24 (diff) | |
| download | podman-762148deb6be6925d17bd12f219f7385e1402439.tar.gz podman-762148deb6be6925d17bd12f219f7385e1402439.tar.bz2 podman-762148deb6be6925d17bd12f219f7385e1402439.zip | |
Split libpod/network package
The `libpod/network` package should only be used on the backend and not the
client. The client used this package only for two functions so move them
into a new `pkg/network` package.
This is needed so we can put linux only code into `libpod/network`, see #9710.
[NO TESTS NEEDED]
Signed-off-by: Paul Holzinger <paul.holzinger@web.de>
Diffstat (limited to 'libpod/network/netconflist.go')
| -rw-r--r-- | libpod/network/netconflist.go | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/libpod/network/netconflist.go b/libpod/network/netconflist.go index 1a1583587..a45a4109a 100644 --- a/libpod/network/netconflist.go +++ b/libpod/network/netconflist.go @@ -7,6 +7,7 @@ import ( "strings" "github.com/containernetworking/cni/libcni" + "github.com/containers/podman/v3/pkg/network" "github.com/containers/podman/v3/pkg/util" "github.com/pkg/errors" ) @@ -211,7 +212,7 @@ func IfPassesFilter(netconf *libcni.NetworkConfigList, filters map[string][]stri case "plugin": // match one plugin - plugins := GetCNIPlugins(netconf) + plugins := network.GetCNIPlugins(netconf) for _, val := range filterValues { if strings.Contains(plugins, val) { result = true @@ -243,7 +244,7 @@ func IfPassesFilter(netconf *libcni.NetworkConfigList, filters map[string][]stri case "driver": // matches only for the DefaultNetworkDriver for _, filterValue := range filterValues { - plugins := GetCNIPlugins(netconf) + plugins := network.GetCNIPlugins(netconf) if filterValue == DefaultNetworkDriver && strings.Contains(plugins, DefaultNetworkDriver) { result = true @@ -253,7 +254,7 @@ func IfPassesFilter(netconf *libcni.NetworkConfigList, filters map[string][]stri case "id": // matches part of one id for _, filterValue := range filterValues { - if strings.Contains(GetNetworkID(netconf.Name), filterValue) { + if strings.Contains(network.GetNetworkID(netconf.Name), filterValue) { result = true break } |