Merge branch 'develop' into NET-545

controllers/migrate.go

@@ -199,7 +199,7 @@ func convertLegacyNode(legacy models.LegacyNode, hostID uuid.UUID) models.Node {
 	node.IsRelay = false
 	node.RelayedNodes = []string{}
 	node.DNSOn = models.ParseBool(legacy.DNSOn)
-	node.PersistentKeepalive = time.Duration(legacy.PersistentKeepalive)
+	node.PersistentKeepalive = time.Duration(int64(time.Second) * int64(legacy.PersistentKeepalive))
 	node.LastModified = time.Now()
 	node.ExpirationDateTime, _ = time.Parse(strconv.Itoa(int(legacy.ExpirationDateTime)), "0")
 	node.EgressGatewayNatEnabled = models.ParseBool(legacy.EgressGatewayNatEnabled)

ee/types.go

@@ -26,13 +26,13 @@ var errValidation = fmt.Errorf(license_validation_err_msg)
 type LicenseKey struct {
 	LicenseValue   string `json:"license_value"` // actual (public) key and the unique value for the key
 	Expiration     int64  `json:"expiration"`
-	UsageServers   int    `json:"usage_servers"`
-	UsageUsers     int    `json:"usage_users"`
-	UsageClients   int    `json:"usage_clients"`
-	UsageHosts     int    `json:"usage_hosts"`
-	UsageNetworks  int    `json:"usage_networks"`
-	UsageIngresses int    `json:"usage_ingresses"`
-	UsageEgresses  int    `json:"usage_egresses"`
+	UsageServers   int    `json:"limit_servers"`
+	UsageUsers     int    `json:"limit_users"`
+	UsageClients   int    `json:"limit_clients"`
+	UsageHosts     int    `json:"limit_hosts"`
+	UsageNetworks  int    `json:"limit_networks"`
+	UsageIngresses int    `json:"limit_ingresses"`
+	UsageEgresses  int    `json:"limit_egresses"`
 	Metadata       string `json:"metadata"`
 	IsActive       bool   `json:"is_active"` // yes if active
 }
@@ -46,7 +46,7 @@ type ValidatedLicense struct {
 // LicenseSecret - the encrypted struct for sending user-id
 type LicenseSecret struct {
 	AssociatedID string `json:"associated_id" binding:"required"` // UUID for user foreign key to User table
-	Usage        Usage  `json:"usage" binding:"required"`
+	Usage        Usage  `json:"limits" binding:"required"`
 }
 
 // Usage - struct for license usage

scripts/nm-upgrade.sh

@@ -168,7 +168,7 @@ save_config() { (
 		save_config_item LICENSE_KEY "$LICENSE_KEY"
 		save_config_item METRICS_EXPORTER "on"
 		save_config_item PROMETHEUS "on"
-		ave_config_item SERVER_IMAGE_TAG "$LATEST-ee"
+		save_config_item SERVER_IMAGE_TAG "$LATEST-ee"
 	else
 		save_config_item METRICS_EXPORTER "off"
 		save_config_item PROMETHEUS "off"