Skip to content

Commit 4c67aa4

Browse files
committed
fix(tests): Round 16 - Fix 5 CI/CD Pipeline errors
Fixed all remaining CI/CD pipeline compilation errors: 1. tests/fixtures/placement_fixtures.go: - Fixed eMBBVNFDeployment → EMBBVNFDeployment (capitalization) - Function exists but was called with incorrect casing 2. adapters/vnf-operator/tests/e2e/monitoring_e2e_test.go: - Fixed makeClusterRequest return type - DoRaw() returns ([]byte, error) not (*http.Response, error) 3. adapters/vnf-operator/tests/monitoring/prometheus_deployment_test.go: - Renamed TestServiceMonitorCreation → TestPrometheusServiceMonitorCreation - Resolves duplicate test function name conflict 4. tn/agent/pkg/iperf_test.go: - Fixed IperfManager field name: mutex → mu - Also changed pointer to value type: sync.RWMutex{} not &sync.RWMutex{} 5. o2-client/pkg/o2dms/enhanced_client.go & o2ims/enhanced_client.go: - Removed dependency on pkg/logging (separate module) - Replaced logging.* calls with standard log.Println - Ensures o2-client module independence All CI/CD Pipeline errors now resolved. Resolves: Docker Build, CodeQL, and CI/CD Pipeline workflow failures
1 parent 2f8dcb4 commit 4c67aa4

6 files changed

Lines changed: 18 additions & 18 deletions

File tree

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -544,7 +544,7 @@ func (suite *MonitoringE2ETestSuite) verifyMetricsFlow(t *testing.T) {
544544

545545
// Helper function to make requests within the cluster
546546
func makeClusterRequest(ctx context.Context, clientset *kubernetes.Clientset, restConfig *rest.Config,
547-
namespace, serviceName, path string) (*http.Response, error) {
547+
namespace, serviceName, path string) ([]byte, error) {
548548

549549
// Create a proxy request to the service
550550
proxyReq := clientset.CoreV1().Services(namespace).ProxyGet("http", serviceName, "", path, nil)

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -157,8 +157,8 @@ func TestPrometheusOperatorInstallation(t *testing.T) {
157157
}
158158
}
159159

160-
// TestServiceMonitorCreation tests ServiceMonitor creation for O-RAN components
161-
func TestServiceMonitorCreation(t *testing.T) {
160+
// TestPrometheusServiceMonitorCreation tests ServiceMonitor creation for O-RAN components with Prometheus
161+
func TestPrometheusServiceMonitorCreation(t *testing.T) {
162162
testCases := []struct {
163163
name string
164164
component string

o2-client/pkg/o2dms/enhanced_client.go

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,13 @@ package o2dms
33
import (
44
"context"
55
"fmt"
6+
"log"
67
"math"
78
"math/rand"
89
"sync"
910
"time"
1011

1112
"github.com/thc1006/O-RAN-Intent-MANO-for-Network-Slicing/o2-client/pkg/models"
12-
"github.com/thc1006/O-RAN-Intent-MANO-for-Network-Slicing/pkg/logging"
1313
)
1414

1515
// Enhanced O2 DMS Client with retry logic, event notifications, and advanced features
@@ -189,7 +189,7 @@ func (c *EnhancedClient) DeleteNFDeploymentWithRetry(ctx context.Context, deploy
189189

190190
// DeployNetworkSlice deploys a complete network slice with multiple NFs
191191
func (c *EnhancedClient) DeployNetworkSlice(ctx context.Context, deploymentManagerID string, sliceSpec *NetworkSliceSpec) (*NetworkSliceDeployment, error) {
192-
logging.Info("deploying network slice",
192+
log.Println("deploying network slice",
193193
"slice_id", sliceSpec.SliceID,
194194
"deployment_manager_id", deploymentManagerID,
195195
"nf_count", len(sliceSpec.NetworkFunctions))
@@ -270,7 +270,7 @@ func (c *EnhancedClient) WaitForDeploymentReadyWithRetry(ctx context.Context, de
270270
var err error
271271
lastDeployment, err = c.GetNFDeploymentWithRetry(ctx, deploymentManagerID, deploymentID)
272272
if err != nil {
273-
logging.Debug("failed to get deployment status",
273+
log.Println("failed to get deployment status",
274274
"deployment_id", deploymentID,
275275
"deployment_manager_id", deploymentManagerID,
276276
"error", err)
@@ -368,7 +368,7 @@ func (c *EnhancedClient) publishEvent(event Event) {
368368
select {
369369
case c.eventChan <- event:
370370
default:
371-
logging.Warn("event channel full, dropping event",
371+
log.Println("event channel full, dropping event",
372372
"event_id", event.ID,
373373
"event_type", event.Type)
374374
}
@@ -384,7 +384,7 @@ func (c *EnhancedClient) processEvent(event Event) {
384384
go func(h EventHandler) {
385385
defer func() {
386386
if r := recover(); r != nil {
387-
logging.Error("event handler panic",
387+
log.Println("event handler panic",
388388
"panic", r,
389389
"event_id", event.ID,
390390
"event_type", event.Type)
@@ -517,7 +517,7 @@ func (c *EnhancedClient) retryWithBackoff(ctx context.Context, fn func() error)
517517
return err
518518
}
519519

520-
logging.Debug("retry attempt",
520+
log.Println("retry attempt",
521521
"attempt", attempt+1,
522522
"max_retries", c.retryConfig.MaxRetries,
523523
"error", err)

o2-client/pkg/o2ims/enhanced_client.go

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import (
88
"time"
99

1010
"github.com/thc1006/O-RAN-Intent-MANO-for-Network-Slicing/o2-client/pkg/models"
11-
"github.com/thc1006/O-RAN-Intent-MANO-for-Network-Slicing/pkg/logging"
11+
"log"
1212
)
1313

1414
// Enhanced O2 IMS Client Methods with retry logic and event handling
@@ -62,7 +62,7 @@ func (c *Client) publishEvent(event Event) {
6262
select {
6363
case c.eventChan <- event:
6464
default:
65-
logging.Warn("event channel full, dropping event",
65+
log.Println("event channel full, dropping event",
6666
"event_id", event.ID,
6767
"event_type", event.Type)
6868
}
@@ -78,7 +78,7 @@ func (c *Client) processEvent(event Event) {
7878
go func(h EventHandler) {
7979
defer func() {
8080
if r := recover(); r != nil {
81-
logging.Error("event handler panic",
81+
log.Println("event handler panic",
8282
"panic", r,
8383
"event_id", event.ID,
8484
"event_type", event.Type)
@@ -168,7 +168,7 @@ func (c *Client) performHealthCheck(ctx context.Context) {
168168

169169
_, err := c.GetHealthInfo(healthCtx)
170170
if err != nil {
171-
logging.Error("health check failed",
171+
log.Println("health check failed",
172172
"source", "o2ims.client",
173173
"error", err)
174174
c.publishEvent(Event{
@@ -180,7 +180,7 @@ func (c *Client) performHealthCheck(ctx context.Context) {
180180
Severity: SeverityError,
181181
})
182182
} else {
183-
logging.Info("health check successful",
183+
log.Println("health check successful",
184184
"source", "o2ims.client")
185185
c.publishEvent(Event{
186186
ID: fmt.Sprintf("health_%d", time.Now().UnixNano()),
@@ -280,7 +280,7 @@ func (c *Client) retryWithBackoff(ctx context.Context, fn func() error) error {
280280
return err
281281
}
282282

283-
logging.Debug("retry attempt",
283+
log.Println("retry attempt",
284284
"attempt", attempt+1,
285285
"max_retries", c.retryConfig.MaxRetries,
286286
"error", err)
@@ -333,7 +333,7 @@ func (c *Client) DiscoverResourcesByCapabilities(ctx context.Context, capabiliti
333333
for _, pool := range pools.Items {
334334
resources, err := c.GetResourcesWithRetry(ctx, pool.ResourcePoolID, models.ResourceFilter{})
335335
if err != nil {
336-
logging.Warn("failed to get resources from pool",
336+
log.Println("failed to get resources from pool",
337337
"pool_id", pool.ResourcePoolID,
338338
"error", err)
339339
continue

tests/fixtures/placement_fixtures.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -232,7 +232,7 @@ type CapacitySummary struct {
232232
func ValidEMBBPlacementRequest() PlacementRequest {
233233
return PlacementRequest{
234234
ID: "placement-embb-001",
235-
VNFSpec: eMBBVNFDeployment(),
235+
VNFSpec: EMBBVNFDeployment(),
236236
QoSProfile: QoSProfile{
237237
Latency: LatencyRequirement{
238238
Value: "20",

tn/agent/pkg/iperf_test.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ func setupTestIperfManager() *IperfManager {
6565
manager := &IperfManager{
6666
logger: logger,
6767
servers: make(map[string]*IperfServer),
68-
mutex: &sync.RWMutex{}, // Add mutex for thread safety
68+
mu: sync.RWMutex{}, // Add mutex for thread safety
6969
}
7070

7171
return manager

0 commit comments

Comments
 (0)