Skip to content

support yaml.v3 #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

support yaml.v3 #1

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 23 additions & 2 deletions v2/network_config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,17 @@ type NetworkConfig struct {
VLANs VLANs `yaml:"vlans,omitempty"`
}

type NetworkConfigForMarshalling struct {
VersionMustBe2 uint8 `yaml:"version"`
Renderer *Renderer `yaml:"renderer,omitempty"`
Ethernets Ethernets `yaml:"ethernets,omitempty"`
Wifis Wifis `yaml:"wifis,omitempty"`
Bridges Bridges `yaml:"bridges,omitempty"`
Bonds Bonds `yaml:"bonds,omitempty"`
Tunnels Tunnels `yaml:"tunnels,omitempty"`
VLANs VLANs `yaml:"vlans,omitempty"`
}

type networkConfigForUnmarshalling struct {
Renderer *Renderer `yaml:"renderer,omitempty"`
Ethernets Ethernets `yaml:"ethernets,omitempty"`
Expand All @@ -28,8 +39,18 @@ type networkConfigForUnmarshalling struct {
// MarshalYAML marshals NetworkConfig as YAML.
// This method used on marshaling YAML internally.
func (n *NetworkConfig) MarshalYAML() (interface{}, error) {
n.VersionMustBe2 = networkVersion2
return n, nil
nm := NetworkConfigForMarshalling{
VersionMustBe2: networkVersion2,
Renderer: n.Renderer,
Ethernets: n.Ethernets,
Wifis: n.Wifis,
Bridges: n.Bridges,
Bonds: n.Bonds,
Tunnels: n.Tunnels,
VLANs: n.VLANs,
}

return nm, nil
}

// UnmarshalYAML unmarshals NetworkConfig as YAML.
Expand Down