Merge pull request #1969 from gravitl/GRA-1045/bug_add_node_to_network

GRA-1045: set node defaults
This commit is contained in:
dcarns 2023-01-24 13:14:59 -05:00 committed by GitHub
commit a81de819d2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 41 deletions

View file

@ -256,41 +256,11 @@ func SetNodeDefaults(node *models.Node) {
postdown := parentNetwork.DefaultPostDown
node.PostDown = postdown
}
// == Parent Network settings ==
node.SetLastModified()
node.SetLastCheckIn()
node.SetDefaultConnected()
node.SetExpirationDateTime()
// == node defaults if not set by parent ==
///TODO ___ REVISIT ------
///TODO ___ REVISIT ------
///TODO ___ REVISIT ------
///TODO ___ REVISIT ------
///TODO ___ REVISIT ------
//node.SetIPForwardingDefault()
//node.SetDNSOnDefault()
//node.SetIsLocalDefault()
//node.SetLastModified()
//node.SetDefaultName()
//node.SetLastCheckIn()
//node.SetLastPeerUpdate()
//node.SetDefaultAction()
//node.SetIsServerDefault()
//node.SetIsStaticDefault()
//node.SetDefaultEgressGateway()
//node.SetDefaultIngressGateway()
//node.SetDefaulIsPending()
//node.SetDefaultMTU()
//node.SetDefaultNFTablesPresent()
//node.SetDefaultIsRelayed()
//node.SetDefaultIsRelay()
//node.SetDefaultIsDocker()
//node.SetDefaultIsK8S()
//node.SetDefaultIsHub()
//node.SetDefaultConnected()
//node.SetDefaultACL()
//node.SetDefaultFailover()
///TODO ___ REVISIT ------
///TODO ___ REVISIT ------
///TODO ___ REVISIT ------
///TODO ___ REVISIT ------
}
// GetRecordKey - get record key

View file

@ -196,13 +196,8 @@ func (node *Node) PrimaryAddress() string {
}
// Node.SetDefaultConnected
func (node *LegacyNode) SetDefaultConnected() {
if node.Connected == "" {
node.Connected = "yes"
}
if node.IsServer == "yes" {
node.Connected = "yes"
}
func (node *Node) SetDefaultConnected() {
node.Connected = true
}
// Node.SetDefaultACL