|
@@ -393,7 +393,7 @@ func GetNetworkByNode(node *models.Node) (models.Network, error) {
|
|
}
|
|
}
|
|
|
|
|
|
// SetNodeDefaults - sets the defaults of a node to avoid empty fields
|
|
// SetNodeDefaults - sets the defaults of a node to avoid empty fields
|
|
-func SetNodeDefaults(node *models.Node) {
|
|
|
|
|
|
+func SetNodeDefaults(node *models.Node, resetConnected bool) {
|
|
|
|
|
|
parentNetwork, _ := GetNetworkByNode(node)
|
|
parentNetwork, _ := GetNetworkByNode(node)
|
|
_, cidr, err := net.ParseCIDR(parentNetwork.AddressRange)
|
|
_, cidr, err := net.ParseCIDR(parentNetwork.AddressRange)
|
|
@@ -416,7 +416,9 @@ func SetNodeDefaults(node *models.Node) {
|
|
if node.LastCheckIn.IsZero() {
|
|
if node.LastCheckIn.IsZero() {
|
|
node.SetLastCheckIn()
|
|
node.SetLastCheckIn()
|
|
}
|
|
}
|
|
- node.SetDefaultConnected()
|
|
|
|
|
|
+ if resetConnected {
|
|
|
|
+ node.SetDefaultConnected()
|
|
|
|
+ }
|
|
node.SetExpirationDateTime()
|
|
node.SetExpirationDateTime()
|
|
}
|
|
}
|
|
|
|
|
|
@@ -463,7 +465,7 @@ func GetDeletedNodeByID(uuid string) (models.Node, error) {
|
|
return models.Node{}, err
|
|
return models.Node{}, err
|
|
}
|
|
}
|
|
|
|
|
|
- SetNodeDefaults(&node)
|
|
|
|
|
|
+ SetNodeDefaults(&node, true)
|
|
|
|
|
|
return node, nil
|
|
return node, nil
|
|
}
|
|
}
|
|
@@ -533,7 +535,7 @@ func createNode(node *models.Node) error {
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
|
|
- SetNodeDefaults(node)
|
|
|
|
|
|
+ SetNodeDefaults(node, true)
|
|
|
|
|
|
defaultACLVal := acls.Allowed
|
|
defaultACLVal := acls.Allowed
|
|
parentNetwork, err := GetNetwork(node.Network)
|
|
parentNetwork, err := GetNetwork(node.Network)
|