Skip to content
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

Vm firewall options #146

Closed
wants to merge 21 commits into from
Closed

Vm firewall options #146

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
a53a116
vzdump api call
Pivnoy Mar 13, 2024
51986f5
Merge pull request #1 from Pivnoy/vzdump
Pivnoy Mar 13, 2024
9ec5fe0
struct tag fix
Pivnoy Mar 13, 2024
1c60063
Merge pull request #2 from Pivnoy/vzdump
Pivnoy Mar 13, 2024
50b62d3
replace vzdump method based on proxmox ve api
Pivnoy Mar 15, 2024
c63ed1a
Merge pull request #3 from Pivnoy/vzdump
Pivnoy Mar 15, 2024
ff0cfce
review comment fixes
Pivnoy Mar 15, 2024
a904ff2
Merge pull request #4 from Pivnoy/vzdump
Pivnoy Mar 15, 2024
11c9af7
Merge branch 'luthermonson:main' into main
Pivnoy Mar 17, 2024
4a746d8
Merge branch 'luthermonson:main' into main
Pivnoy Mar 30, 2024
375c1b5
cluster tasks api call
Pivnoy Mar 30, 2024
c0aa37c
Merge pull request #5 from Pivnoy/cluster-tasks
Pivnoy Mar 30, 2024
6e5c7e3
add client instance to cluster task
Pivnoy Mar 30, 2024
ca9c0bb
Merge pull request #6 from Pivnoy/cluster-tasks
Pivnoy Mar 30, 2024
b620ff0
Merge branch 'luthermonson:main' into main
Pivnoy Apr 1, 2024
69ab3df
Merge branch 'luthermonson:main' into main
Pivnoy May 3, 2024
0187fca
update firewall options
Pivnoy May 3, 2024
551e941
update field types
Pivnoy May 3, 2024
4875d86
update field types
Pivnoy May 3, 2024
202a4a6
change firewall get option func
Pivnoy May 4, 2024
21bfc4a
change for common types
Pivnoy May 4, 2024
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
20 changes: 10 additions & 10 deletions types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -980,16 +980,16 @@
}

type FirewallVirtualMachineOption struct {
Enable bool `json:"enable,omitempty"`
Dhcp bool `json:"dhcp,omitempty"`
Ipfilter bool `json:"ipfilter,omitempty"`
LogLevelIn string `json:"log_level_in,omitempty"`
LogLevelOut string `json:"log_level_out,omitempty"`
Macfilter bool `json:"macfilter,omitempty"`
Ntp bool `json:"ntp,omitempty"`
PolicyIn string `json:"policy_in,omitempty"`
PolicyOut string `json:"policy_out,omitempty"`
Radv bool `json:"radv,omitempty"`
Enable *IntOrBool `json:"enable,omitempty"`
Dhcp *IntOrBool `json:"dhcp,omitempty"`
IpFilter *IntOrBool `json:"ipfilter,omitempty"`

Check failure on line 985 in types.go

View workflow job for this annotation

GitHub Actions / ci 

var-naming: struct field IpFilter should be IPFilter (revive)
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

revive complaining about this one too, should be IPFilter

LogLevelIn *string `json:"log_level_in,omitempty"`
LogLevelOut *string `json:"log_level_out,omitempty"`
MacFilter *IntOrBool `json:"macfilter,omitempty"`
Ndp *IntOrBool `json:"ndp,omitempty"`
PolicyIn *string `json:"policy_in,omitempty"`
PolicyOut *string `json:"policy_out,omitempty"`
Radv *IntOrBool `json:"radv,omitempty"`
}

type Snapshot struct {
Expand Down
11 changes: 8 additions & 3 deletions virtual_machine.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -569,9 +569,14 @@ func (v *VirtualMachine) AgentSetUserPassword(ctx context.Context, password stri
return v.client.Post(ctx, fmt.Sprintf("/nodes/%s/qemu/%d/agent/set-user-password", v.Node, v.VMID), map[string]string{"password": password, "username": username}, nil)
}

func (v *VirtualMachine) FirewallOptionGet(ctx context.Context) (firewallOption *FirewallVirtualMachineOption, err error) {
err = v.client.Get(ctx, fmt.Sprintf("/nodes/%s/qemu/%d/firewall/options", v.Node, v.VMID), firewallOption)
return
func (v *VirtualMachine) FirewallOptionGet(ctx context.Context) (*FirewallVirtualMachineOption, error) {
firewallOption := FirewallVirtualMachineOption{}

if err := v.client.Get(ctx, fmt.Sprintf("/nodes/%s/qemu/%d/firewall/options", v.Node, v.VMID), &firewallOption); err != nil {
return nil, err
}

return &firewallOption, nil
}

func (v *VirtualMachine) FirewallOptionSet(ctx context.Context, firewallOption *FirewallVirtualMachineOption) error {
Expand Down
Loading