Skip to content

Commit 1c52c00

Browse files
committed
fix(ci): resolve Round 3 test compilation errors (6 issues)
Round 3 Fixes: 1. Test Redeclarations (2 files): - adapters/vnf-operator/pkg/dms/o2_client_test.go - Removed duplicate O2DMSClient type - adapters/vnf-operator/pkg/translator/nephio_packager_test.go - Removed duplicate NephioPackager type 2. Ginkgo API Issues (3 files): - tests/chaos/monitoring_chaos_test.go:612 - Fixed TestMain to use &testing.T{} + os.Exit - tests/e2e/monitoring_e2e_test.go:109 - Fixed HaveLen to use len() directly - tests/performance/monitoring_performance_test.go:468 - Fixed []byte to io.ReadCloser with io.NopCloser 3. Syntax Error (1 file): - tests/monitoring/servicemonitor_test.go:144 - Fixed "SafeT LSConfig" typo (space removed) All test files now properly: - Import types from main package files - Use correct Ginkgo/Gomega API syntax - Handle io.ReadCloser interfaces correctly - Have valid Go syntax Expected result: All go vet errors resolved, tests compile successfully
1 parent 19bec46 commit 1c52c00

7 files changed

Lines changed: 16 additions & 86 deletions

File tree

CI_FIX_REPORT.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,10 @@
88

99
## 📊 Execution Summary
1010

11-
**Total Rounds**: 1 (in progress)
12-
**Fixes Applied**: 4
13-
**Workflows Fixed**: 1
14-
**Remaining Issues**: ~17
11+
**Total Rounds**: 2 (completed)
12+
**Fixes Applied**: 7
13+
**Workflows Fixed**: 2 (Docker Build, Dependency Review)
14+
**Remaining Issues**: ~6 go vet errors
1515

1616
---
1717

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

Lines changed: 2 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -14,39 +14,8 @@ import (
1414
"github.com/thc1006/O-RAN-Intent-MANO-for-Network-Slicing/tests/mocks"
1515
)
1616

17-
// HTTPClient interface for dependency injection
18-
type HTTPClient interface {
19-
Do(req *http.Request) (*http.Response, error)
20-
}
21-
22-
// O2DMSClient - the client we're testing (not implemented yet)
23-
type O2DMSClient struct {
24-
BaseURL string
25-
AuthToken string
26-
HTTPClient HTTPClient
27-
Timeout time.Duration
28-
RetryCount int
29-
}
30-
31-
// ClientConfig for O2 DMS client configuration
32-
type ClientConfig struct {
33-
BaseURL string
34-
AuthToken string
35-
Timeout time.Duration
36-
RetryCount int
37-
}
38-
39-
// NewO2DMSClient creates a new O2 DMS client (not implemented yet)
40-
func NewO2DMSClient(config ClientConfig) *O2DMSClient {
41-
// Intentionally not implemented to cause test failure (RED phase)
42-
return nil
43-
}
44-
45-
// Interface methods that need to be implemented
46-
func (c *O2DMSClient) GetInventory(ctx context.Context) (*fixtures.O2DMSInventoryResponse, error) {
47-
// Not implemented yet - will cause tests to fail
48-
return nil, nil
49-
}
17+
// Note: O2DMSClient, ClientConfig, and related methods are defined in client.go
18+
// This test file uses the types from the main package
5019

5120
func (c *O2DMSClient) GetResources(ctx context.Context, filter string) (*fixtures.O2DMSResourceResponse, error) {
5221
// Not implemented yet - will cause tests to fail

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

Lines changed: 2 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -12,51 +12,8 @@ import (
1212
"github.com/thc1006/O-RAN-Intent-MANO-for-Network-Slicing/tests/mocks"
1313
)
1414

15-
// PorchClient interface for Nephio package operations
16-
type PorchClient interface {
17-
CreatePackage(ctx context.Context, pkg *mocks.NephioPackage) error
18-
UpdatePackage(ctx context.Context, name string, pkg *mocks.NephioPackage) error
19-
DeletePackage(ctx context.Context, name string) error
20-
GetPackage(ctx context.Context, name string) (*mocks.NephioPackage, error)
21-
ListPackages(ctx context.Context) ([]*mocks.NephioPackage, error)
22-
ApprovePackage(ctx context.Context, name string) error
23-
ProposePackage(ctx context.Context, name string) error
24-
}
25-
26-
// NephioPackager - the packager we're testing (not implemented yet)
27-
type NephioPackager struct {
28-
PorchClient PorchClient
29-
Repository string
30-
Namespace string
31-
}
32-
33-
// PackagerConfig for Nephio packager configuration
34-
type PackagerConfig struct {
35-
Repository string
36-
Namespace string
37-
}
38-
39-
// NewNephioPackager creates a new Nephio packager (not implemented yet)
40-
func NewNephioPackager(client PorchClient, config PackagerConfig) *NephioPackager {
41-
// Intentionally not implemented to cause test failure (RED phase)
42-
return nil
43-
}
44-
45-
// Interface methods that need to be implemented
46-
func (p *NephioPackager) CreateVNFPackage(ctx context.Context, vnfSpec *fixtures.VNFDeployment) (*mocks.NephioPackage, error) {
47-
// Not implemented yet - will cause tests to fail
48-
return nil, nil
49-
}
50-
51-
func (p *NephioPackager) UpdateVNFPackage(ctx context.Context, packageName string, vnfSpec *fixtures.VNFDeployment) error {
52-
// Not implemented yet - will cause tests to fail
53-
return nil
54-
}
55-
56-
func (p *NephioPackager) DeleteVNFPackage(ctx context.Context, packageName string) error {
57-
// Not implemented yet - will cause tests to fail
58-
return nil
59-
}
15+
// Note: NephioPackager, PackagerConfig, PorchClient and related methods are defined in nephio_packager.go
16+
// This test file uses the types from the main package
6017

6118
func (p *NephioPackager) GenerateKptfile(vnfSpec *fixtures.VNFDeployment) (*mocks.Kptfile, error) {
6219
// Not implemented yet - will cause tests to fail

adapters/vnf-operator/tests/chaos/monitoring_chaos_test.go

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ import (
55
"encoding/json"
66
"fmt"
77
"net/http"
8+
"os"
89
"testing"
910
"time"
1011

@@ -609,5 +610,6 @@ func TestMonitoringChaos(t *testing.T) {
609610

610611
func TestMain(m *testing.M) {
611612
RegisterFailHandler(Fail)
612-
RunSpecs(m, "Monitoring Chaos Test Suite")
613+
RunSpecs(&testing.T{}, "Monitoring Chaos Test Suite")
614+
os.Exit(m.Run())
613615
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ var _ = Describe("O-RAN Monitoring Stack E2E Tests", func() {
106106
for _, serviceName := range services {
107107
service, err := clientset.CoreV1().Services(namespace).Get(ctx, serviceName, metav1.GetOptions{})
108108
Expect(err).NotTo(HaveOccurred())
109-
Expect(service.Spec.Ports).To(HaveLen(BeNumerically(">=", 1)))
109+
Expect(len(service.Spec.Ports)).To(BeNumerically(">=", 1))
110110
Expect(service.Spec.Selector).ToNot(BeEmpty())
111111
}
112112
})

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,7 @@ func TestServiceMonitorCreation(t *testing.T) {
141141
Interval: "15s",
142142
ScrapeTimeout: "5s",
143143
TLSConfig: &monitoringv1.TLSConfig{
144-
SafeT LSConfig: monitoringv1.SafeTLSConfig{
144+
SafeTLSConfig: monitoringv1.SafeTLSConfig{
145145
InsecureSkipVerify: false,
146146
ServerName: "vnf-operator.o-ran-mano.svc.cluster.local",
147147
},

adapters/vnf-operator/tests/performance/monitoring_performance_test.go

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,11 @@
11
package performance
22

33
import (
4+
"bytes"
45
"context"
56
"encoding/json"
67
"fmt"
8+
"io"
79
"math/rand"
810
"net/http"
911
"sync"
@@ -465,7 +467,7 @@ func executePrometheusQuery(ctx context.Context, clientset *kubernetes.Clientset
465467
path := fmt.Sprintf("api/v1/query?query=%s", query)
466468
proxyReq := clientset.CoreV1().Services(namespace).ProxyGet("http", "prometheus", "", path, nil)
467469
resp, _ := proxyReq.DoRaw(ctx)
468-
return &http.Response{Body: resp}
470+
return &http.Response{Body: io.NopCloser(bytes.NewReader(resp))}
469471
}
470472

471473
func getPrometheusMemoryUsage(ctx context.Context, clientset *kubernetes.Clientset, restConfig *rest.Config, namespace string) float64 {

0 commit comments

Comments
 (0)