fix(tests): Round 22 - Fix 6 compilation errors

1. MockK8sClient.Apply method signature:
   - Changed from (ctx, Object, ...PatchOption) to (ctx, ApplyConfiguration, ...ApplyOption)
   - Matches controller-runtime v0.18+ API requirements

2. O2DMSClient httpClient field type:
   - Fixed all 6 test instances to wrap MockHTTPClient in &http.Client{}
   - Resolves type mismatch between mock and actual http.Client pointer

3. NephioPackager struct initialization:
   - Removed non-existent PorchClient, Repository, Namespace fields
   - Used actual struct fields: logger, workingDir, registry
   - Added missing log/slog import

4. Unused imports cleanup:
   - Removed unused labels import from monitoring_e2e_test.go
   - Removed unused require import from tn/agent/pkg/iperf_test.go

5. Added StackValidation type:
   - Defined missing type used by ValidateStack() method
   - Includes ComponentsRunning, HealthStatus, ValidationErrors, Timestamp

Errors fixed: 6 total
Total errors fixed across all 22 rounds: 119

Author: thc1006

adapters/vnf-operator/pkg/dms/o2_client_test.go

@@ -120,7 +120,7 @@ func TestO2DMSClient_GetInventory(t *testing.T) {
 			client := &O2DMSClient{
 				Endpoint:   "http://test-o2dms:8080",
 				Token:      "test-token",
-				httpClient: mockHTTP,
+				httpClient: &http.Client{Transport: mockHTTP},
 				maxRetries: 3,
 				retryDelay: time.Second,
 			}
@@ -213,7 +213,7 @@ func TestO2DMSClient_GetResources(t *testing.T) {
 			client := &O2DMSClient{
 				Endpoint:   "http://test-o2dms:8080",
 				Token:      "test-token",
-				httpClient: mockHTTP,
+				httpClient: &http.Client{Transport: mockHTTP},
 			}
 
 			result, err := client.GetResources(context.Background(), tt.filter)
@@ -275,7 +275,7 @@ func TestO2DMSClient_GetConfiguration(t *testing.T) {
 			client := &O2DMSClient{
 				Endpoint:   "http://test-o2dms:8080",
 				Token:      "test-token",
-				httpClient: mockHTTP,
+				httpClient: &http.Client{Transport: mockHTTP},
 			}
 
 			result, err := client.GetConfiguration(context.Background(), tt.resourceID)
@@ -350,7 +350,7 @@ func TestO2DMSClient_UpdateConfiguration(t *testing.T) {
 			client := &O2DMSClient{
 				Endpoint:   "http://test-o2dms:8080",
 				Token:      "test-token",
-				httpClient: mockHTTP,
+				httpClient: &http.Client{Transport: mockHTTP},
 			}
 
 			err := client.UpdateConfiguration(context.Background(), tt.resourceID, tt.config)
@@ -427,7 +427,7 @@ func TestO2DMSClient_RetryLogic(t *testing.T) {
 			client := &O2DMSClient{
 				Endpoint:   "http://test-o2dms:8080",
 				Token:      "test-token",
-				httpClient: mockHTTP,
+				httpClient: &http.Client{Transport: mockHTTP},
 				RetryCount: tt.retryCount,
 			}
 
@@ -490,7 +490,7 @@ func TestO2DMSClient_ErrorHandling(t *testing.T) {
 			client := &O2DMSClient{
 				Endpoint:   "http://test-o2dms:8080",
 				Token:      "test-token",
-				httpClient: mockHTTP,
+				httpClient: &http.Client{Transport: mockHTTP},
 			}
 
 			_, err := client.GetInventory(context.Background())
@@ -551,7 +551,7 @@ func TestO2DMSClient_Subscribe(t *testing.T) {
 			client := &O2DMSClient{
 				Endpoint:   "http://test-o2dms:8080",
 				Token:      "test-token",
-				httpClient: mockHTTP,
+				httpClient: &http.Client{Transport: mockHTTP},
 			}
 
 			result, err := client.Subscribe(context.Background(), tt.request)

adapters/vnf-operator/pkg/translator/nephio_packager_test.go

@@ -2,6 +2,7 @@ package translator
 
 import (
 	"context"
+	"log/slog"
 	"testing"
 
 	"github.com/stretchr/testify/assert"
@@ -130,9 +131,9 @@ func TestNephioPackager_CreateVNFPackage(t *testing.T) {
 
 			// Create packager
 			packager := &NephioPackager{
-				PorchClient: mockPorch,
-				Repository:  "test-repo",
-				Namespace:   "oran-system",
+				logger:     slog.Default(),
+				workingDir: "/tmp/nephio-packages",
+				registry:   "test-registry",
 			}
 
 			// Execute test

adapters/vnf-operator/tests/e2e/monitoring_e2e_test.go

@@ -17,7 +17,6 @@ import (
 	"github.com/stretchr/testify/suite"
 	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-	"k8s.io/apimachinery/pkg/labels"
 	"k8s.io/apimachinery/pkg/util/wait"
 	"k8s.io/client-go/kubernetes"
 	"k8s.io/client-go/rest"

adapters/vnf-operator/tests/monitoring/e2e_observability_test.go

@@ -191,6 +191,14 @@ type Notification struct {
 	SentAt      time.Time
 }
 
+// StackValidation represents validation results
+type StackValidation struct {
+	ComponentsRunning []string
+	HealthStatus      map[string]string
+	ValidationErrors  []string
+	Timestamp         time.Time
+}
+
 // NotificationResult represents notification delivery result
 type NotificationResult struct {
 	Receiver    string

go.work.sum

@@ -162,6 +162,7 @@ github.com/jessevdk/go-flags v1.6.1 h1:Cvu5U8UGrLay1rZfv/zP7iLpSHGUZ/Ou68T0iX1bB
 github.com/jessevdk/go-flags v1.6.1/go.mod h1:Mk8T1hIAWpOiJiHa9rJASDK2UGWji0EuPGBnNLMooyc=
 github.com/jonboulle/clockwork v0.5.0 h1:Hyh9A8u51kptdkR+cqRpT1EebBwTn1oK9YfGYbdFz6I=
 github.com/jonboulle/clockwork v0.5.0/go.mod h1:3mZlmanh0g2NDKO5TWZVJAfofYk64M7XN3SzBPjZF60=
+github.com/josharian/intern v1.0.0/go.mod h1:5DoeVV0s6jJacbCEi61lwdGj/aVlrQvzHFFd8Hwg//Y=
 github.com/julienschmidt/httprouter v1.3.0 h1:U0609e9tgbseu3rBINet9P48AI/D3oJs4dN7jwJOQ1U=
 github.com/julienschmidt/httprouter v1.3.0/go.mod h1:JR6WtHb+2LUe8TCKY3cZOxFyyO8IZAc4RVcycCCAKdM=
 github.com/kisielk/errcheck v1.5.0 h1:e8esj/e4R+SAOwFwN+n3zr0nYeCyeweozKfO23MvHzY=
@@ -170,6 +171,7 @@ github.com/klauspost/cpuid/v2 v2.2.9/go.mod h1:rqkxqrZ1EhYM9G+hXH7YdowN5R5RGN6NK
 github.com/knz/go-libedit v1.10.1 h1:0pHpWtx9vcvC0xGZqEQlQdfSQs7WRlAjuPvk3fOZDCo=
 github.com/knz/go-libedit v1.10.1/go.mod h1:MZTVkCWyz0oBc7JOWP3wNAzd002ZbM/5hgShxwh4x8M=
 github.com/kr/pty v1.1.1 h1:VkoXIwSboBpnk99O/KFauAEILuNHv5DVFKZMBN/gUgw=
+github.com/mailru/easyjson v0.7.7/go.mod h1:xzfreul335JAWq5oZzymOObrkdz5UnU4kGfJJLY9Nlc=
 github.com/mattn/go-colorable v0.1.13 h1:fFA4WZxdEF4tXPZVKMLwD8oUnCTTo08duU7wxecdEvA=
 github.com/mattn/go-colorable v0.1.13/go.mod h1:7S9/ev0klgBDR4GtXTXX8a3vIGJpMovkB8vQcUbaXHg=
 github.com/matttproud/golang_protobuf_extensions v1.0.1 h1:4hp9jkHxhMHkqkrB3Ix0jegS5sx/RkqARlsWZ6pIwiU=

tests/mocks/k8s_client_mock.go

@@ -89,7 +89,7 @@ func (m *MockK8sClient) Patch(ctx context.Context, obj client.Object, patch clie
 	return nil
 }
 
-func (m *MockK8sClient) Apply(ctx context.Context, obj client.Object, opts ...client.PatchOption) error {
+func (m *MockK8sClient) Apply(ctx context.Context, obj runtime.ApplyConfiguration, opts ...client.ApplyOption) error {
 	return nil
 }
 

tn/agent/pkg/iperf_test.go

@@ -10,7 +10,6 @@ import (
 	"time"
 
 	"github.com/stretchr/testify/assert"
-	"github.com/stretchr/testify/require"
 	"github.com/stretchr/testify/suite"
 )