opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-06-25 20:26:51 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #19666 from ashley-cui/testinit

Browse Source 
Update machine init and set tests
This commit is contained in:
OpenShift Merge Robot
2023-08-28 10:14:49 +02:00
committed by GitHub
parent 6ed4df964c b6b300c798
commit 92c5880683
11 changed files with 119 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
docs/source/markdown/podman-machine-inspect.1.md
View File

@ -23,18 +23,19 @@ Rootless only.
Print results with a Go template.
| **Placeholder** | **Description** |
| ------------------- | ----------------------------------------------------- |
| .ConfigPath ... | Machine configuration file location |
| .ConnectionInfo ... | Machine connection information |
| .Created | Machine creation time (string, ISO3601) |
| .Image ... | Machine image config |
| .LastUp | Time when machine was last booted |
| .Name | Name of the machine |
| .Resources ... | Resources used by the machine |
| .SSHConfig ... | SSH configuration info for communitating with machine |
| .State ... | Machine state |
| .UserModeNetworking | Whether this machine uses user-mode networking |
| **Placeholder** | **Description** |
| ------------------- | --------------------------------------------------------------------- |
| .ConfigPath ... | Machine configuration file location |
| .ConnectionInfo ... | Machine connection information |
| .Created | Machine creation time (string, ISO3601) |
| .Image ... | Machine image config |
| .LastUp | Time when machine was last booted |
| .Name | Name of the machine |
| .Resources ... | Resources used by the machine |
| .Rootful | Whether the machine prefers rootful or rootless container execution |
| .SSHConfig ... | SSH configuration info for communitating with machine |
| .State ... | Machine state |
| .UserModeNetworking | Whether this machine uses user-mode networking |
#### **--help**

1
pkg/machine/applehv/machine.go
View File

@ -317,6 +317,7 @@ func (m *MacMachine) Inspect() (*machine.InspectInfo, error) {
},
SSHConfig: m.SSHConfig,
State: vmState,
Rootful: m.Rootful,
}
return &ii, nil
}

1
pkg/machine/config.go
View File

@ -151,6 +151,7 @@ type InspectInfo struct {
SSHConfig SSHConfig
State Status
UserModeNetworking bool
Rootful bool
}
func (rc RemoteConnectionType) MakeSSHURL(host, path, port, userName string) url.URL {

29
pkg/machine/e2e/config_init_test.go
View File

@ -19,16 +19,17 @@ type initMachine struct {
--volume-driver string Optional volume driver
*/
cpus *uint
diskSize *uint
ignitionPath string
username string
imagePath string
memory *uint
now bool
timezone string
rootful bool
volumes []string
cpus *uint
diskSize *uint
ignitionPath string
username string
imagePath string
memory *uint
now bool
timezone string
rootful bool
volumes []string
userModeNetworking bool
cmd []string
}
@ -65,6 +66,9 @@ func (i *initMachine) buildCmd(m *machineTestBuilder) []string {
if i.rootful {
cmd = append(cmd, "--rootful")
}
if i.userModeNetworking {
cmd = append(cmd, "--user-mode-networking")
}
cmd = append(cmd, m.name)
i.cmd = cmd
return cmd
@ -118,3 +122,8 @@ func (i *initMachine) withRootful(r bool) *initMachine {
i.rootful = r
return i
}
func (i *initMachine) withUserModeNetworking(r bool) *initMachine {
i.userModeNetworking = r
return i
}

17
pkg/machine/e2e/config_set_test.go
View File

@ -5,10 +5,11 @@ import (
)
type setMachine struct {
cpus *uint
diskSize *uint
memory *uint
rootful bool
cpus *uint
diskSize *uint
memory *uint
rootful bool
userModeNetworking bool
cmd []string
}
@ -27,6 +28,9 @@ func (i *setMachine) buildCmd(m *machineTestBuilder) []string {
if i.rootful {
cmd = append(cmd, "--rootful")
}
if i.userModeNetworking {
cmd = append(cmd, "--user-mode-networking")
}
cmd = append(cmd, m.name)
i.cmd = cmd
return cmd
@ -50,3 +54,8 @@ func (i *setMachine) withRootful(r bool) *setMachine {
i.rootful = r
return i
}
func (i *setMachine) withUserModeNetworking(r bool) *setMachine {
i.userModeNetworking = r
return i
}

14
pkg/machine/e2e/config_test.go
View File

@ -6,6 +6,7 @@ import (
"os"
"os/exec"
"path/filepath"
"runtime"
"strings"
"time"
@ -201,3 +202,16 @@ func (matcher *ValidJSONMatcher) FailureMessage(actual interface{}) (message str
func (matcher *ValidJSONMatcher) NegatedFailureMessage(actual interface{}) (message string) {
return format.Message(actual, "to _not_ be valid JSON")
}
func checkReason(reason string) {
if len(reason) < 5 {
panic("Test must specify a reason to skip")
}
}
func SkipIfNotWindows(reason string) {
checkReason(reason)
if runtime.GOOS != "windows" {
Skip("[not windows]: " + reason)
}
}

26
pkg/machine/e2e/init_test.go
View File

@ -186,7 +186,7 @@ var _ = Describe("podman machine init", func() {
})
It("machine init rootful docker.sock check", func() {
It("machine init rootful with docker.sock check", func() {
i := initMachine{}
name := randomString()
session, err := mb.setName(name).setCmd(i.withImagePath(mb.imagePath).withRootful(true)).run()
@ -198,6 +198,13 @@ var _ = Describe("podman machine init", func() {
Expect(err).ToNot(HaveOccurred())
Expect(ssession).Should(Exit(0))
inspect := new(inspectMachine)
inspect = inspect.withFormat("{{.Rootful}}")
inspectSession, err := mb.setName(name).setCmd(inspect).run()
Expect(err).ToNot(HaveOccurred())
Expect(inspectSession).To(Exit(0))
Expect(inspectSession.outputToString()).To(Equal("true"))
ssh2 := sshMachine{}
sshSession2, err := mb.setName(name).setCmd(ssh2.withSSHCommand([]string{"readlink /var/run/docker.sock"})).run()
Expect(err).ToNot(HaveOccurred())
@ -205,4 +212,21 @@ var _ = Describe("podman machine init", func() {
output := strings.TrimSpace(sshSession2.outputToString())
Expect(output).To(Equal("/run/podman/podman.sock"))
})
It("init with user mode networking ", func() {
SkipIfNotWindows("setting user mode networking is only honored on Windows")
i := new(initMachine)
name := randomString()
session, err := mb.setName(name).setCmd(i.withImagePath(mb.imagePath).withUserModeNetworking(true)).run()
Expect(err).ToNot(HaveOccurred())
Expect(session).To(Exit(0))
inspect := new(inspectMachine)
inspect = inspect.withFormat("{{.UserModeNetworking}}")
inspectSession, err := mb.setName(name).setCmd(inspect).run()
Expect(err).ToNot(HaveOccurred())
Expect(inspectSession).To(Exit(0))
Expect(inspectSession.outputToString()).To(Equal("true"))
})
})

31
pkg/machine/e2e/set_test.go
View File

@ -101,7 +101,7 @@ var _ = Describe("podman machine set", func() {
Expect(sshSession3.outputToString()).To(ContainSubstring("100 GiB"))
})
It("set rootful, docker sock change", func() {
It("set rootful with docker sock change", func() {
name := randomString()
i := new(initMachine)
session, err := mb.setName(name).setCmd(i.withImagePath(mb.imagePath)).run()
@ -118,6 +118,13 @@ var _ = Describe("podman machine set", func() {
Expect(err).ToNot(HaveOccurred())
Expect(startSession).To(Exit(0))
inspect := new(inspectMachine)
inspect = inspect.withFormat("{{.Rootful}}")
inspectSession, err := mb.setName(name).setCmd(inspect).run()
Expect(err).ToNot(HaveOccurred())
Expect(inspectSession).To(Exit(0))
Expect(inspectSession.outputToString()).To(Equal("true"))
ssh2 := sshMachine{}
sshSession2, err := mb.setName(name).setCmd(ssh2.withSSHCommand([]string{"readlink /var/run/docker.sock"})).run()
Expect(err).ToNot(HaveOccurred())
@ -125,4 +132,26 @@ var _ = Describe("podman machine set", func() {
output := strings.TrimSpace(sshSession2.outputToString())
Expect(output).To(Equal("/run/podman/podman.sock"))
})
It("set user mode networking", func() {
SkipIfNotWindows("Setting user mode networking is only honored on Windows")
name := randomString()
i := new(initMachine)
session, err := mb.setName(name).setCmd(i.withImagePath(mb.imagePath)).run()
Expect(err).ToNot(HaveOccurred())
Expect(session).To(Exit(0))
set := setMachine{}
setSession, err := mb.setName(name).setCmd(set.withUserModeNetworking(true)).run()
Expect(err).ToNot(HaveOccurred())
Expect(setSession).To(Exit(0))
inspect := new(inspectMachine)
inspect = inspect.withFormat("{{.UserModeNetworking}}")
inspectSession, err := mb.setName(name).setCmd(inspect).run()
Expect(err).ToNot(HaveOccurred())
Expect(inspectSession).To(Exit(0))
Expect(inspectSession.outputToString()).To(Equal("true"))
})
})

1
pkg/machine/hyperv/machine.go
View File

@ -303,6 +303,7 @@ func (m *HyperVMachine) Inspect() (*machine.InspectInfo, error) {
},
SSHConfig: m.SSHConfig,
State: vm.State().String(),
Rootful: m.Rootful,
}, nil
}

1
pkg/machine/qemu/machine.go
View File

@ -1596,6 +1596,7 @@ func (v *MachineVM) Inspect() (*machine.InspectInfo, error) {
SSHConfig: v.SSHConfig,
State: state,
UserModeNetworking: true, // always true
Rootful: v.Rootful,
}, nil
}

1
pkg/machine/wsl/machine.go
View File

@ -1745,6 +1745,7 @@ func (v *MachineVM) Inspect() (*machine.InspectInfo, error) {
SSHConfig: v.SSHConfig,
State: state,
UserModeNetworking: v.UserModeNetworking,
Rootful: v.Rootful,
}, nil
}