F-93: onerange plugin to onelease

Signed-off-by: Jaime <[email protected]>
OpenNebula · Nov 27, 2024 · eb37b6f · eb37b6f
1 parent b598a84
commit eb37b6f
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 310 deletions.
diff --git a/appliances/VRouter/DHCP4v2/dhcpcore-onelease/main.go b/appliances/VRouter/DHCP4v2/dhcpcore-onelease/main.go
@@ -15,7 +15,6 @@ import (
 	dhcpcoreconfig "github.com/coredhcp/coredhcp/config"
 
 	pl_onelease "github.com/OpenNebula/one-apps/appliances/VRouterd/DHCP4v2/dhcpcore-onelease/plugins/onelease"
-	pl_onerange "github.com/OpenNebula/one-apps/appliances/VRouterd/DHCP4v2/dhcpcore-onelease/plugins/onerange"
 
 	"github.com/coredhcp/coredhcp/plugins"
 	pl_autoconfigure "github.com/coredhcp/coredhcp/plugins/autoconfigure"
@@ -72,7 +71,6 @@ var desiredPlugins = []*plugins.Plugin{
 	&pl_nbp.Plugin,
 	&pl_netmask.Plugin,
 	&pl_onelease.Plugin,
-	&pl_onerange.Plugin,
 	&pl_prefix.Plugin,
 	//&pl_range.Plugin,
 	&pl_router.Plugin,

diff --git a/appliances/VRouter/DHCP4v2/dhcpcore-onelease/plugins/onelease/onelease.go b/appliances/VRouter/DHCP4v2/dhcpcore-onelease/plugins/onelease/onelease.go
diff --git a/appliances/VRouter/DHCP4v2/dhcpcore-onelease/plugins/onelease/onelease_test.go b/appliances/VRouter/DHCP4v2/dhcpcore-onelease/plugins/onelease/onelease_test.go
diff --git a/...pcore-onelease/plugins/onerange/plugin.go → ...pcore-onelease/plugins/onelease/plugin.go b/...pcore-onelease/plugins/onerange/plugin.go → ...pcore-onelease/plugins/onelease/plugin.go
@@ -6,7 +6,7 @@
 // Adapted by OpenNebula Systems for the VRouter appliance
 // Copyright 2024-present OpenNebula Systems
 
-package onerange
+package onelease
 
 import (
 	"database/sql"
@@ -29,11 +29,11 @@ import (
 	"github.com/spf13/pflag"
 )
 
-var log = logger.GetLogger("plugins/onerange")
+var log = logger.GetLogger("plugins/onelease")
 
 // Plugin wraps plugin registration information
 var Plugin = plugins.Plugin{
-	Name:   "onerange",
+	Name:   "onelease",
 	Setup4: setupRange,
 }
 
@@ -201,7 +201,7 @@ func setupRange(args ...string) (handler.Handler4, error) {
 	var excludedIPs string
 	var macPrefix string
 
-	pluginFlags := pflag.NewFlagSet("onerange", pflag.ExitOnError)
+	pluginFlags := pflag.NewFlagSet("onelease", pflag.ExitOnError)
 
 	pluginFlags.StringVar(&excludedIPs, "excluded-ips", "", "Comma-separated list of excluded IP addresses")
 	pluginFlags.BoolVar(&p.enableMAC2IP, "mac2ip", false, "Enables MAC to IP address mapping")

diff --git a/...core-onelease/plugins/onerange/storage.go → ...core-onelease/plugins/onelease/storage.go b/...core-onelease/plugins/onerange/storage.go → ...core-onelease/plugins/onelease/storage.go
@@ -6,7 +6,7 @@
 // Adapted by OpenNebula Systems for the VRouter appliance
 // Copyright 2024-present OpenNebula Systems
 
-package onerange
+package onelease
 
 import (
 	"database/sql"

diff --git a/...onelease/plugins/onerange/storage_test.go → ...onelease/plugins/onelease/storage_test.go b/...onelease/plugins/onerange/storage_test.go → ...onelease/plugins/onelease/storage_test.go
@@ -6,7 +6,7 @@
 // Adapted by OpenNebula Systems for the VRouter appliance
 // Copyright 2024-present OpenNebula Systems
 
-package onerange
+package onelease
 
 import (
 	"database/sql"