This repository has been archived by the owner on Jan 20, 2021. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 3
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Move network conversions out of API router
This stuff doesn't belong here and is causing imports of libnetwork into the router, which is not what we want. Signed-off-by: Brian Goff <cpuguy83@gmail.com>
- Loading branch information
Showing
11 changed files
with
442 additions
and
371 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,93 +1 @@ | ||
| package network // import "github.com/docker/docker/api/server/router/network" | ||
|
|
||
| import ( | ||
| "github.com/docker/docker/api/types" | ||
| "github.com/docker/docker/api/types/filters" | ||
| "github.com/docker/docker/runconfig" | ||
| ) | ||
|
|
||
| func filterNetworkByType(nws []types.NetworkResource, netType string) ([]types.NetworkResource, error) { | ||
| retNws := []types.NetworkResource{} | ||
| switch netType { | ||
| case "builtin": | ||
| for _, nw := range nws { | ||
| if runconfig.IsPreDefinedNetwork(nw.Name) { | ||
| retNws = append(retNws, nw) | ||
| } | ||
| } | ||
| case "custom": | ||
| for _, nw := range nws { | ||
| if !runconfig.IsPreDefinedNetwork(nw.Name) { | ||
| retNws = append(retNws, nw) | ||
| } | ||
| } | ||
| default: | ||
| return nil, invalidFilter(netType) | ||
| } | ||
| return retNws, nil | ||
| } | ||
|
|
||
| type invalidFilter string | ||
|
|
||
| func (e invalidFilter) Error() string { | ||
| return "Invalid filter: 'type'='" + string(e) + "'" | ||
| } | ||
|
|
||
| func (e invalidFilter) InvalidParameter() {} | ||
|
|
||
| // filterNetworks filters network list according to user specified filter | ||
| // and returns user chosen networks | ||
| func filterNetworks(nws []types.NetworkResource, filter filters.Args) ([]types.NetworkResource, error) { | ||
| // if filter is empty, return original network list | ||
| if filter.Len() == 0 { | ||
| return nws, nil | ||
| } | ||
|
|
||
| displayNet := []types.NetworkResource{} | ||
| for _, nw := range nws { | ||
| if filter.Contains("driver") { | ||
| if !filter.ExactMatch("driver", nw.Driver) { | ||
| continue | ||
| } | ||
| } | ||
| if filter.Contains("name") { | ||
| if !filter.Match("name", nw.Name) { | ||
| continue | ||
| } | ||
| } | ||
| if filter.Contains("id") { | ||
| if !filter.Match("id", nw.ID) { | ||
| continue | ||
| } | ||
| } | ||
| if filter.Contains("label") { | ||
| if !filter.MatchKVList("label", nw.Labels) { | ||
| continue | ||
| } | ||
| } | ||
| if filter.Contains("scope") { | ||
| if !filter.ExactMatch("scope", nw.Scope) { | ||
| continue | ||
| } | ||
| } | ||
| displayNet = append(displayNet, nw) | ||
| } | ||
|
|
||
| if filter.Contains("type") { | ||
| typeNet := []types.NetworkResource{} | ||
| errFilter := filter.WalkValues("type", func(fval string) error { | ||
| passList, err := filterNetworkByType(displayNet, fval) | ||
| if err != nil { | ||
| return err | ||
| } | ||
| typeNet = append(typeNet, passList...) | ||
| return nil | ||
| }) | ||
| if errFilter != nil { | ||
| return nil, errFilter | ||
| } | ||
| displayNet = typeNet | ||
| } | ||
|
|
||
| return displayNet, nil | ||
| } |
Oops, something went wrong.