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

NET-655 #2670

Merged
merged 10 commits into from
Dec 21, 2023
Merged

NET-655 #2670

Changes from 3 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
514221d
NET-655
uGiFarukh Nov 15, 2023
d9a7088
added ServerVersion structure to hostpull model
uGiFarukh Nov 15, 2023
9c7e3df
removed ServerVersion structure
uGiFarukh Nov 16, 2023
b17aeff
added egressroute and fwupdate to hostpull handler
uGiFarukh Nov 22, 2023
e628a19
Merge branch 'develop' into NET-655
theguy951357 Dec 6, 2023
68a3e5b
Merge branch 'develop' of https://github.com/gravitl/netmaker into NE…
abhishek9686 Dec 14, 2023
c128725
add host update fallback handler
abhishek9686 Dec 14, 2023
16b0e41
set broker type on server cfg
abhishek9686 Dec 19, 2023
e68bbbd
use actual host password to create emqx user
abhishek9686 Dec 20, 2023
b20ad3d
rebase with develop
abhishek9686 Dec 20, 2023
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
14 changes: 8 additions & 6 deletions models/structs.go
View file
Open in desktop
Copy link
Member

Choose a reason for hiding this comment

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

what about the changes to set these fields under the pull handler??

Original file line number Diff line number Diff line change
Expand Up @@ -223,12 +223,14 @@ type TrafficKeys struct {

// HostPull - response of a host's pull
type HostPull struct {
Host Host `json:"host" yaml:"host"`
Nodes []Node `json:"nodes" yaml:"nodes"`
Peers []wgtypes.PeerConfig `json:"peers" yaml:"peers"`
ServerConfig ServerConfig `json:"server_config" yaml:"server_config"`
PeerIDs PeerMap `json:"peer_ids,omitempty" yaml:"peer_ids,omitempty"`
HostNetworkInfo HostInfoMap `json:"host_network_info,omitempty" yaml:"host_network_info,omitempty"`
Host Host `json:"host" yaml:"host"`
Nodes []Node `json:"nodes" yaml:"nodes"`
Peers []wgtypes.PeerConfig `json:"peers" yaml:"peers"`
ServerConfig ServerConfig `json:"server_config" yaml:"server_config"`
PeerIDs PeerMap `json:"peer_ids,omitempty" yaml:"peer_ids,omitempty"`
HostNetworkInfo HostInfoMap `json:"host_network_info,omitempty" yaml:"host_network_info,omitempty"`
EgressRoutes []EgressNetworkRoutes `json:"egress_network_routes"`
FwUpdate FwUpdate `json:"fw_update"`
}

// NodeGet - struct for a single node get response
Expand Down