Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 29 additions & 0 deletions osac-operator/internal/adapters/adapters_suite_test.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
/*
Copyright 2026.

Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at

http://www.apache.org/licenses/LICENSE-2.0

Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
*/

package adapters_test

import (
"testing"

. "github.com/onsi/ginkgo/v2"
. "github.com/onsi/gomega"
)

func TestAdapters(t *testing.T) {
RegisterFailHandler(Fail)
RunSpecs(t, "Adapters Suite")
}
60 changes: 60 additions & 0 deletions osac-operator/internal/adapters/grpc_network_class_fetcher.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,60 @@
/*
Copyright 2026.

Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at

http://www.apache.org/licenses/LICENSE-2.0

Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
*/

// Package adapters provides internal implementations of public pkg/ interfaces
// for osac-operator's own use.
package adapters

import (
"context"
"fmt"

privatev1 "github.com/osac-project/osac/osac-operator/internal/api/osac/private/v1"
"github.com/osac-project/osac/osac-operator/pkg/dispatcher"
)

// GRPCNetworkClassFetcher adapts the generated privatev1.NetworkClassesClient
// to the dispatcher.NetworkClassFetcher interface.
type GRPCNetworkClassFetcher struct {
client privatev1.NetworkClassesClient
}

// NewGRPCNetworkClassFetcher creates a fetcher that delegates to the given gRPC client.
func NewGRPCNetworkClassFetcher(client privatev1.NetworkClassesClient) *GRPCNetworkClassFetcher {
return &GRPCNetworkClassFetcher{client: client}
}

// FetchNetworkClass calls the gRPC NetworkClasses.Get endpoint and returns the
// extracted manager names.
func (f *GRPCNetworkClassFetcher) FetchNetworkClass(
ctx context.Context,
id string,
) (*dispatcher.NetworkClassInfo, error) {
resp, err := f.client.Get(ctx, &privatev1.NetworkClassesGetRequest{Id: id})
if err != nil {
return nil, err
}

nc := resp.GetObject()
if nc == nil {
return nil, fmt.Errorf("NetworkClass %q: response contains no object", id)
}

return &dispatcher.NetworkClassInfo{
FabricManager: nc.GetFabricManager(),
K8sManager: nc.GetK8SManager(),
}, nil
}
117 changes: 117 additions & 0 deletions osac-operator/internal/adapters/grpc_network_class_fetcher_test.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,117 @@
/*
Copyright 2026.

Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at

http://www.apache.org/licenses/LICENSE-2.0

Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
*/

package adapters_test

import (
"context"
"fmt"

. "github.com/onsi/ginkgo/v2"
. "github.com/onsi/gomega"
"google.golang.org/grpc"

"github.com/osac-project/osac/osac-operator/internal/adapters"
privatev1 "github.com/osac-project/osac/osac-operator/internal/api/osac/private/v1"
)

type stubNetworkClassesClient struct {
privatev1.NetworkClassesClient
getFunc func(ctx context.Context, in *privatev1.NetworkClassesGetRequest, opts ...grpc.CallOption) (*privatev1.NetworkClassesGetResponse, error)
}

func (s *stubNetworkClassesClient) Get(
ctx context.Context,
in *privatev1.NetworkClassesGetRequest,
opts ...grpc.CallOption,
) (*privatev1.NetworkClassesGetResponse, error) {
return s.getFunc(ctx, in, opts...)
}

var _ = Describe("GRPCNetworkClassFetcher", func() {
var ctx context.Context

BeforeEach(func() {
ctx = context.Background()
})

It("returns both managers when present", func() {
k8sManager := "cudn_localnet"
stub := &stubNetworkClassesClient{
getFunc: func(_ context.Context, req *privatev1.NetworkClassesGetRequest, _ ...grpc.CallOption) (*privatev1.NetworkClassesGetResponse, error) {
Expect(req.GetId()).To(Equal("nc-1"))
return &privatev1.NetworkClassesGetResponse{
Object: &privatev1.NetworkClass{
Id: "nc-1",
FabricManager: "netris",
K8SManager: &k8sManager,
},
}, nil
},
}

fetcher := adapters.NewGRPCNetworkClassFetcher(stub)
info, err := fetcher.FetchNetworkClass(ctx, "nc-1")
Expect(err).NotTo(HaveOccurred())
Expect(info.FabricManager).To(Equal("netris"))
Expect(info.K8sManager).To(Equal("cudn_localnet"))
})

It("returns empty K8sManager when not specified", func() {
stub := &stubNetworkClassesClient{
getFunc: func(_ context.Context, _ *privatev1.NetworkClassesGetRequest, _ ...grpc.CallOption) (*privatev1.NetworkClassesGetResponse, error) {
return &privatev1.NetworkClassesGetResponse{
Object: &privatev1.NetworkClass{
Id: "nc-2",
FabricManager: "netris",
},
}, nil
},
}

fetcher := adapters.NewGRPCNetworkClassFetcher(stub)
info, err := fetcher.FetchNetworkClass(ctx, "nc-2")
Expect(err).NotTo(HaveOccurred())
Expect(info.FabricManager).To(Equal("netris"))
Expect(info.K8sManager).To(BeEmpty())
})

It("propagates gRPC errors", func() {
stub := &stubNetworkClassesClient{
getFunc: func(_ context.Context, _ *privatev1.NetworkClassesGetRequest, _ ...grpc.CallOption) (*privatev1.NetworkClassesGetResponse, error) {
return nil, fmt.Errorf("rpc error: code = Unavailable")
},
}

fetcher := adapters.NewGRPCNetworkClassFetcher(stub)
_, err := fetcher.FetchNetworkClass(ctx, "nc-err")
Expect(err).To(HaveOccurred())
Expect(err.Error()).To(ContainSubstring("Unavailable"))
})

It("returns error when response object is nil", func() {
stub := &stubNetworkClassesClient{
getFunc: func(_ context.Context, _ *privatev1.NetworkClassesGetRequest, _ ...grpc.CallOption) (*privatev1.NetworkClassesGetResponse, error) {
return &privatev1.NetworkClassesGetResponse{Object: nil}, nil
},
}

fetcher := adapters.NewGRPCNetworkClassFetcher(stub)
_, err := fetcher.FetchNetworkClass(ctx, "nc-nil")
Expect(err).To(HaveOccurred())
Expect(err.Error()).To(ContainSubstring("response contains no object"))
})
})
36 changes: 15 additions & 21 deletions osac-operator/pkg/dispatcher/dispatch_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -27,10 +27,8 @@ import (
"k8s.io/apimachinery/pkg/runtime"
"sigs.k8s.io/controller-runtime/pkg/client/fake"

privatev1 "github.com/osac-project/osac/osac-operator/internal/api/osac/private/v1"
"github.com/osac-project/osac/osac-operator/pkg/dispatcher"
"github.com/osac-project/osac/osac-operator/pkg/networkmanager"
"google.golang.org/grpc"
)

var _ = Describe("DispatchTable", func() {
Expand Down Expand Up @@ -150,22 +148,19 @@ var _ = Describe("Dispatcher", func() {
Expect(corev1.AddToScheme(scheme)).To(Succeed())
})

newStubWithManagers := func(fabricName string, k8sName *string) *stubNetworkClassesClient {
return &stubNetworkClassesClient{
getFunc: func(_ context.Context, _ *privatev1.NetworkClassesGetRequest, _ ...grpc.CallOption) (*privatev1.NetworkClassesGetResponse, error) {
return &privatev1.NetworkClassesGetResponse{
Object: &privatev1.NetworkClass{
Id: "nc-test",
FabricManager: fabricName,
K8SManager: k8sName,
},
newStubWithManagers := func(fabricName, k8sName string) *stubNetworkClassFetcher {
return &stubNetworkClassFetcher{
fetchFunc: func(_ context.Context, _ string) (*dispatcher.NetworkClassInfo, error) {
return &dispatcher.NetworkClassInfo{
FabricManager: fabricName,
K8sManager: k8sName,
}, nil
},
}
}

It("dispatches VirtualNetwork to fabric only", func() {
stub := newStubWithManagers("netris", nil)
stub := newStubWithManagers("netris", "")
cl := fake.NewClientBuilder().WithScheme(scheme).WithObjects(
newFabricManagerConfigMap("fm-netris", "netris", "ipv4"),
).Build()
Expand All @@ -183,8 +178,7 @@ var _ = Describe("Dispatcher", func() {
})

It("dispatches Subnet to fabric + k8s when both configured", func() {
k8sName := "cudn_localnet"
stub := newStubWithManagers("neutron", &k8sName)
stub := newStubWithManagers("neutron", "cudn_localnet")
cl := fake.NewClientBuilder().WithScheme(scheme).WithObjects(
newFabricManagerConfigMap("fm-neutron", "neutron", "ipv4,ipv6,dualStack"),
newK8sManagerConfigMap("km-cudn", "cudn_localnet", "ipv4,ipv6,dualStack"),
Expand All @@ -204,8 +198,8 @@ var _ = Describe("Dispatcher", func() {
Expect(plan.K8sTarget().Manager.Name).To(Equal("cudn_localnet"))
})

It("dispatches Subnet to fabric only when k8sManager is nil", func() {
stub := newStubWithManagers("netris", nil)
It("dispatches Subnet to fabric only when k8sManager is empty", func() {
stub := newStubWithManagers("netris", "")
cl := fake.NewClientBuilder().WithScheme(scheme).WithObjects(
newFabricManagerConfigMap("fm-netris", "netris", "ipv4"),
).Build()
Expand All @@ -223,7 +217,7 @@ var _ = Describe("Dispatcher", func() {
})

It("dispatches SecurityGroup to fabric only", func() {
stub := newStubWithManagers("netris", nil)
stub := newStubWithManagers("netris", "")
cl := fake.NewClientBuilder().WithScheme(scheme).WithObjects(
newFabricManagerConfigMap("fm-netris", "netris", "ipv4"),
).Build()
Expand All @@ -240,7 +234,7 @@ var _ = Describe("Dispatcher", func() {
})

It("dispatches NATGateway to fabric only", func() {
stub := newStubWithManagers("netris", nil)
stub := newStubWithManagers("netris", "")
cl := fake.NewClientBuilder().WithScheme(scheme).WithObjects(
newFabricManagerConfigMap("fm-netris", "netris", "ipv4"),
).Build()
Expand All @@ -257,7 +251,7 @@ var _ = Describe("Dispatcher", func() {
})

It("returns error for unknown resource kind", func() {
stub := newStubWithManagers("netris", nil)
stub := newStubWithManagers("netris", "")
cl := fake.NewClientBuilder().WithScheme(scheme).WithObjects(
newFabricManagerConfigMap("fm-netris", "netris", "ipv4"),
).Build()
Expand All @@ -274,8 +268,8 @@ var _ = Describe("Dispatcher", func() {
})

It("propagates resolver errors", func() {
stub := &stubNetworkClassesClient{
getFunc: func(_ context.Context, _ *privatev1.NetworkClassesGetRequest, _ ...grpc.CallOption) (*privatev1.NetworkClassesGetResponse, error) {
stub := &stubNetworkClassFetcher{
fetchFunc: func(_ context.Context, _ string) (*dispatcher.NetworkClassInfo, error) {
return nil, fmt.Errorf("connection refused")
},
}
Expand Down
36 changes: 36 additions & 0 deletions osac-operator/pkg/dispatcher/network_class_fetcher.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
/*
Copyright 2026.

Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at

http://www.apache.org/licenses/LICENSE-2.0

Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
*/

package dispatcher

import (
"context"
)

// NetworkClassInfo holds the manager names extracted from a NetworkClass.
type NetworkClassInfo struct {
// FabricManager is the name of the fabric manager. Always required.
FabricManager string

// K8sManager is the name of the k8s manager, or empty when the
// NetworkClass does not specify one.
K8sManager string
}

// NetworkClassFetcher retrieves NetworkClass manager configuration by ID.
type NetworkClassFetcher interface {
FetchNetworkClass(ctx context.Context, id string) (*NetworkClassInfo, error)
}
Loading
Loading