diff options
author | baude <bbaude@redhat.com> | 2021-02-01 14:42:38 -0600 |
---|---|---|
committer | baude <bbaude@redhat.com> | 2021-02-01 14:42:38 -0600 |
commit | e11d8f15e8d7559bc70ebef2dd0125be9d692da5 (patch) | |
tree | 93cb63e3a92b39ebb33ceb8aed07e31a283011e9 /test/e2e/common_test.go | |
parent | 20183349fd2c6a9a569c6c79234af48bb5d92ff7 (diff) | |
download | podman-e11d8f15e8d7559bc70ebef2dd0125be9d692da5.tar.gz podman-e11d8f15e8d7559bc70ebef2dd0125be9d692da5.tar.bz2 podman-e11d8f15e8d7559bc70ebef2dd0125be9d692da5.zip |
add macvlan as a supported network driver
instead of using the --macvlan to indicate that you want to make a
macvlan network, podman network create now honors the driver name of
*macvlan*. Any options to macvlan, like the parent device, should be
specified as a -o option. For example, -o parent=eth0.
the --macvlan option was marked as deprecated in the man page but is
still supported for the duration of 3.0.
Signed-off-by: baude <bbaude@redhat.com>
Diffstat (limited to 'test/e2e/common_test.go')
-rw-r--r-- | test/e2e/common_test.go | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/test/e2e/common_test.go b/test/e2e/common_test.go index 781bbb6d2..ffa6f1329 100644 --- a/test/e2e/common_test.go +++ b/test/e2e/common_test.go @@ -1,6 +1,7 @@ package integration import ( + "bytes" "fmt" "io/ioutil" "math/rand" @@ -794,3 +795,12 @@ func (p *PodmanTestIntegration) removeCNINetwork(name string) { session.WaitWithDefaultTimeout() Expect(session.ExitCode()).To(BeNumerically("<=", 1)) } + +func (p *PodmanSessionIntegration) jq(jqCommand string) (string, error) { + var out bytes.Buffer + cmd := exec.Command("jq", jqCommand) + cmd.Stdin = strings.NewReader(p.OutputToString()) + cmd.Stdout = &out + err := cmd.Run() + return strings.TrimRight(out.String(), "\n"), err +} |