containers
/
podman
mirror of https://github.com/containers/podman.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #19401 from jakecorrenti/fix-hyperv-load-from-json-name 

Fix HyperV loadMachineFromJSON function name
This commit is contained in:
OpenShift Merge Robot 2023-07-31 15:46:04 +02:00 committed by GitHub
parent b6a52f1f8b 837bc25681
commit 320fc6ca36
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/machine/hyperv/config.go
View File

@ -50,7 +50,7 @@ func (v HyperVVirtualization) IsValidVMName(name string) (bool, error) {
if err != nil {
return false, err
}
if err := loadMacMachineFromJSON(configDir, &mm); err != nil {
if err := mm.loadHyperVMachineFromJSON(configDir); err != nil {
return false, err
}
// The name is valid for the local filesystem
@ -257,7 +257,7 @@ func (v HyperVVirtualization) loadFromLocalJson() ([]*HyperVMachine, error) {
for _, jsonFile := range jsonFiles {
mm := HyperVMachine{}
if err := loadMacMachineFromJSON(jsonFile, &mm); err != nil {
if err := mm.loadHyperVMachineFromJSON(jsonFile); err != nil {
return nil, err
}
if err != nil {

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

@ -520,7 +520,7 @@ func (m *HyperVMachine) loadFromFile() (*HyperVMachine, error) {
}
mm := HyperVMachine{}
if err := loadMacMachineFromJSON(jsonPath, &mm); err != nil {
if err := mm.loadHyperVMachineFromJSON(jsonPath); err != nil {
return nil, err
}
vmm := hypervctl.NewVirtualMachineManager()
@ -555,7 +555,7 @@ func getVMConfigPath(configDir, vmName string) string {
return filepath.Join(configDir, fmt.Sprintf("%s.json", vmName))
}
func loadMacMachineFromJSON(fqConfigPath string, macMachine *HyperVMachine) error {
func (m *HyperVMachine) loadHyperVMachineFromJSON(fqConfigPath string) error {
b, err := os.ReadFile(fqConfigPath)
if err != nil {
if errors.Is(err, fs.ErrNotExist) {
@ -563,7 +563,7 @@ func loadMacMachineFromJSON(fqConfigPath string, macMachine *HyperVMachine) erro
}
return err
}
return json.Unmarshal(b, macMachine)
return json.Unmarshal(b, m)
}
func (m *HyperVMachine) startHostNetworking() (string, machine.APIForwardingState, error) {