From 73386e8f2e3f09bdf1e2793dade21235ffc020b1 Mon Sep 17 00:00:00 2001 From: Abhishek Kondur Date: Tue, 24 Jan 2023 12:37:12 +0400 Subject: [PATCH] set node defaults --- logic/nodes.go | 38 ++++---------------------------------- models/node.go | 9 ++------- 2 files changed, 6 insertions(+), 41 deletions(-) diff --git a/logic/nodes.go b/logic/nodes.go index 4ddb708a..c30aeb2a 100644 --- a/logic/nodes.go +++ b/logic/nodes.go @@ -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 diff --git a/models/node.go b/models/node.go index e60de275..0e1d85c8 100644 --- a/models/node.go +++ b/models/node.go @@ -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