diff --git a/pkg/framework/fake/plugin/fake.go b/pkg/framework/fake/plugin/fake.go index c745a84e1..327b1bb36 100644 --- a/pkg/framework/fake/plugin/fake.go +++ b/pkg/framework/fake/plugin/fake.go @@ -408,3 +408,55 @@ func (d *FakeFilterPlugin) handleBoolAction(action Action) bool { } panic(fmt.Errorf("unhandled %q action", action.GetExtensionPoint())) } + +// RegisterFakePlugin registers a FakePlugin with the given registry +func RegisterFakePlugin(name string, plugin *FakePlugin, registry pluginregistry.Registry) { + pluginregistry.Register( + name, + NewPluginFncFromFake(plugin), + &FakePlugin{}, + &FakePluginArgs{}, + ValidateFakePluginArgs, + SetDefaults_FakePluginArgs, + registry, + ) +} + +// RegisterFakeDeschedulePlugin registers a FakeDeschedulePlugin with the given registry +func RegisterFakeDeschedulePlugin(name string, plugin *FakeDeschedulePlugin, registry pluginregistry.Registry) { + pluginregistry.Register( + name, + NewFakeDeschedulePluginFncFromFake(plugin), + &FakeDeschedulePlugin{}, + &FakeDeschedulePluginArgs{}, + ValidateFakePluginArgs, + SetDefaults_FakePluginArgs, + registry, + ) +} + +// RegisterFakeBalancePlugin registers a FakeBalancePlugin with the given registry +func RegisterFakeBalancePlugin(name string, plugin *FakeBalancePlugin, registry pluginregistry.Registry) { + pluginregistry.Register( + name, + NewFakeBalancePluginFncFromFake(plugin), + &FakeBalancePlugin{}, + &FakeBalancePluginArgs{}, + ValidateFakePluginArgs, + SetDefaults_FakePluginArgs, + registry, + ) +} + +// RegisterFakeFilterPlugin registers a FakeFilterPlugin with the given registry +func RegisterFakeFilterPlugin(name string, plugin *FakeFilterPlugin, registry pluginregistry.Registry) { + pluginregistry.Register( + name, + NewFakeFilterPluginFncFromFake(plugin), + &FakeFilterPlugin{}, + &FakeFilterPluginArgs{}, + ValidateFakePluginArgs, + SetDefaults_FakePluginArgs, + registry, + ) +} diff --git a/pkg/framework/profile/profile_test.go b/pkg/framework/profile/profile_test.go index b9d546a31..6ffde11ac 100644 --- a/pkg/framework/profile/profile_test.go +++ b/pkg/framework/profile/profile_test.go @@ -138,15 +138,7 @@ func TestProfileDescheduleBalanceExtensionPointsEviction(t *testing.T) { } pluginregistry.PluginRegistry = pluginregistry.NewRegistry() - pluginregistry.Register( - "FakePlugin", - fakeplugin.NewPluginFncFromFake(&fakePlugin), - &fakeplugin.FakePlugin{}, - &fakeplugin.FakePluginArgs{}, - fakeplugin.ValidateFakePluginArgs, - fakeplugin.SetDefaults_FakePluginArgs, - pluginregistry.PluginRegistry, - ) + fakeplugin.RegisterFakePlugin("FakePlugin", &fakePlugin, pluginregistry.PluginRegistry) pluginregistry.Register( defaultevictor.PluginName, @@ -251,45 +243,10 @@ func TestProfileExtensionPoints(t *testing.T) { fakeBalancePlugin := &fakeplugin.FakeBalancePlugin{PluginName: balancePluginName} fakeFilterPlugin := &fakeplugin.FakeFilterPlugin{PluginName: filterPluginName} - pluginregistry.Register( - fakePluginName, - fakeplugin.NewPluginFncFromFake(fakePlugin), - &fakeplugin.FakePlugin{}, - &fakeplugin.FakePluginArgs{}, - fakeplugin.ValidateFakePluginArgs, - fakeplugin.SetDefaults_FakePluginArgs, - pluginregistry.PluginRegistry, - ) - - pluginregistry.Register( - deschedulePluginName, - fakeplugin.NewFakeDeschedulePluginFncFromFake(fakeDeschedulePlugin), - &fakeplugin.FakeDeschedulePlugin{}, - &fakeplugin.FakeDeschedulePluginArgs{}, - fakeplugin.ValidateFakePluginArgs, - fakeplugin.SetDefaults_FakePluginArgs, - pluginregistry.PluginRegistry, - ) - - pluginregistry.Register( - balancePluginName, - fakeplugin.NewFakeBalancePluginFncFromFake(fakeBalancePlugin), - &fakeplugin.FakeBalancePlugin{}, - &fakeplugin.FakeBalancePluginArgs{}, - fakeplugin.ValidateFakePluginArgs, - fakeplugin.SetDefaults_FakePluginArgs, - pluginregistry.PluginRegistry, - ) - - pluginregistry.Register( - filterPluginName, - fakeplugin.NewFakeFilterPluginFncFromFake(fakeFilterPlugin), - &fakeplugin.FakeFilterPlugin{}, - &fakeplugin.FakeFilterPluginArgs{}, - fakeplugin.ValidateFakePluginArgs, - fakeplugin.SetDefaults_FakePluginArgs, - pluginregistry.PluginRegistry, - ) + fakeplugin.RegisterFakePlugin(fakePluginName, fakePlugin, pluginregistry.PluginRegistry) + fakeplugin.RegisterFakeDeschedulePlugin(deschedulePluginName, fakeDeschedulePlugin, pluginregistry.PluginRegistry) + fakeplugin.RegisterFakeBalancePlugin(balancePluginName, fakeBalancePlugin, pluginregistry.PluginRegistry) + fakeplugin.RegisterFakeFilterPlugin(filterPluginName, fakeFilterPlugin, pluginregistry.PluginRegistry) } pluginregistry.Register( @@ -456,15 +413,7 @@ func TestProfileExtensionPointOrdering(t *testing.T) { }) // plugin implementing Filter extension point - pluginregistry.Register( - pluginName, - fakeplugin.NewFakeFilterPluginFncFromFake(fakeFilterPlugin), - &fakeplugin.FakeFilterPlugin{}, - &fakeplugin.FakeFilterPluginArgs{}, - fakeplugin.ValidateFakePluginArgs, - fakeplugin.SetDefaults_FakePluginArgs, - pluginregistry.PluginRegistry, - ) + fakeplugin.RegisterFakeFilterPlugin(pluginName, fakeFilterPlugin, pluginregistry.PluginRegistry) fakePluginName := fmt.Sprintf("FakePlugin_%v", i) fakePlugin := fakeplugin.FakePlugin{} @@ -489,15 +438,7 @@ func TestProfileExtensionPointOrdering(t *testing.T) { return true, false, nil }) - pluginregistry.Register( - fakePluginName, - fakeplugin.NewPluginFncFromFake(&fakePlugin), - &fakeplugin.FakePlugin{}, - &fakeplugin.FakePluginArgs{}, - fakeplugin.ValidateFakePluginArgs, - fakeplugin.SetDefaults_FakePluginArgs, - pluginregistry.PluginRegistry, - ) + fakeplugin.RegisterFakePlugin(fakePluginName, &fakePlugin, pluginregistry.PluginRegistry) } pluginregistry.Register(