Commit69b397a

authored

Merge pull request#27410 from baude/fixdupmachinenames

Fix use of duplicate machine names

2 parents937636b +553c4a1 commit69b397aCopy full SHA for 69b397a

File tree

-3

lines changed

-3

lines changed

Lines changed: 4 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -208,7 +208,10 @@ func initMachine(cmd *cobra.Command, args []string) error {`
`208`	`208`	`// Check if machine already exists`
`209`	`209`	`varerrNotExists*define.ErrVMDoesNotExist`
`210`	`210`	`_,_,err:=shim.VMExists(initOpts.Name)`
`211`		`-// errors.As checks for nil so safe to use.`
	`211`	`+// if nil, means we found a vm and need to reject it by name`
	`212`	`+iferr==nil {`
	`213`	`+return&define.ErrVMAlreadyExists{Name:initOpts.Name}`
	`214`	`+}`
`212`	`215`	`if!errors.As(err,&errNotExists) {`
`213`	`216`	`returnerr`
`214`	`217`	`}`

Lines changed: 5 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -117,6 +117,11 @@ var _ = Describe("podman machine init", func() {`
`117`	`117`	`Expect(testMachine.Resources.CPUs).To(Equal(uint64(cpus)))`
`118`	`118`	`Expect(testMachine.Resources.Memory).To(BeEquivalentTo(uint64(2048)))`
`119`	`119`	`}`
	`120`	`+// creating a new VM with the same name must fail`
	`121`	`+repeatSession,err:=mb.setCmd(i.withImage(mb.imagePath)).run()`
	`122`	`+Expect(err).ToNot(HaveOccurred())`
	`123`	`+Expect(repeatSession).To(Exit(125))`
	`124`	`+Expect(repeatSession.errorToString()).To(ContainSubstring(fmt.Sprintf("Error: machine %q already exists",mb.names[0])))`
`120`	`125`	`})`
`121`	`126`
`122`	`127`	`It("run playbook",func() {`
`@@ -655,7 +660,6 @@ var _ = Describe("podman machine init", func() {`
`655`	`660`	`session,err:=mb.setName(machineName).setCmd(i.withImage(mb.imagePath).withProvider(providerOverride)).run()`
`656`	`661`	`Expect(err).ToNot(HaveOccurred())`
`657`	`662`	`Expect(session.errorToString()).To(ContainSubstring(fmt.Sprintf("unsupported provider %q",providerOverride)))`
`658`		`-`
`659`	`663`	`})`
`660`	`664`
`661`	`665`	`It("machine init --provider",func() {`
`@@ -699,7 +703,6 @@ var _ = Describe("podman machine init", func() {`
`699`	`703`	`Expect(p).To(Equal(l.VMType))`
`700`	`704`	`}`
`701`	`705`	`})`
`702`		`-`
`703`	`706`	`})`
`704`	`707`
`705`	`708`	varp4Config= []byte(`{

Comments

(0)