Browse Source

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

GRA-1045: set node defaults
dcarns 2 years ago
parent
commit
a81de819d2
2 changed files with 7 additions and 42 deletions
  1. 5 35
      logic/nodes.go
  2. 2 7
      models/node.go

+ 5 - 35
logic/nodes.go

@@ -256,41 +256,11 @@ func SetNodeDefaults(node *models.Node) {
 		postdown := parentNetwork.DefaultPostDown
 		node.PostDown = postdown
 	}
-	// == Parent Network settings ==
-
-	// == 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 ------
+	node.SetLastModified()
+	node.SetLastCheckIn()
+	node.SetDefaultConnected()
+	node.SetExpirationDateTime()
+
 }
 
 // GetRecordKey - get record key

+ 2 - 7
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