Merge pull request #43 from smart-edge-open/sriov-fec-23.05

Sriov-fec 23.05

CONTRIBUTING.md

@@ -33,11 +33,7 @@ Maintainers act as the gatekeeper to the code - ensuring that coding standards,
 * Answering questions/emails on the relevant areas of the SRIOV-FEC code base.
 
 ## Submitting Changes
-<<<<<<< HEAD
-Inbound contributions are done through [pull requests](https://github.com/smart-edge-open/sriov-fec-operator/sriov-fec/pulls) which include code changes, enhancements, bug fixes or new applications/features. If you are getting started, you may refer to Github's [how-to](https://help.github.com/articles/using-pull-requests/). With your contributions, we expect that you:
-=======
 Inbound contributions are done through [pull requests](https://github.com/smart-edge-open/sriov-fec-operator/pulls) which include code changes, enhancements, bug fixes or new applications/features. If you are getting started, you may refer to Github's [how-to](https://help.github.com/articles/using-pull-requests/). With your contributions, we expect that you:
->>>>>>> main
 
 * certify that you wrote and/or have the right to submit the pull request,
 * agree with the [Developer Certificate of Origin](http://developercertificate.org/),

controllers/suite_test.go

@@ -20,19 +20,11 @@ package controllers
 
 import (
 	"github.com/go-logr/logr"
-<<<<<<< HEAD
-	"github.com/smart-edge-open/sriov-fec-operator/sriov-fec/pkg/common/utils"
-	"path/filepath"
-	"testing"
-
-	sriovfecv2 "github.com/smart-edge-open/sriov-fec-operator/sriov-fec/api/v2"
-=======
 	"github.com/smart-edge-open/sriov-fec-operator/pkg/common/utils"
 	"path/filepath"
 	"testing"
 
 	sriovfecv2 "github.com/smart-edge-open/sriov-fec-operator/api/v2"
->>>>>>> main
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
 	"k8s.io/client-go/kubernetes/scheme"

pkg/common/assets/suite_test.go

@@ -7,6 +7,9 @@ import (
 	"context"
 	"github.com/go-logr/logr"
 	"github.com/smart-edge-open/sriov-fec-operator/pkg/common/utils"
+	corev1 "k8s.io/api/core/v1"
+	"k8s.io/utils/pointer"
+	"os"
 	"path/filepath"
 	"testing"
 

pkg/daemon/bbdevconfig.go

@@ -6,6 +6,7 @@ package daemon
 import (
 	"fmt"
 	sriovv2 "github.com/smart-edge-open/sriov-fec-operator/api/v2"
+	"github.com/smart-edge-open/sriov-fec-operator/pkg/common/utils"
 	"github.com/sirupsen/logrus"
 	"os"
 	"os/exec"

pkg/daemon/daemon_test.go

@@ -8,7 +8,7 @@ import (
 	"encoding/json"
 	"fmt"
 	"github.com/google/uuid"
-	"github.com/smart-edge-open/sriov-fec-operator/sriov-fec/pkg/common/utils"
+	"github.com/smart-edge-open/sriov-fec-operator/pkg/common/utils"
 	"io/ioutil"
 	"os"
 	"path/filepath"

pkg/daemon/telemetry.go

@@ -4,8 +4,8 @@ import (
 	"context"
 	"errors"
 	"fmt"
-	fec "github.com/smart-edge-open/sriov-fec-operator/sriov-fec/api/v2"
-	"github.com/smart-edge-open/sriov-fec-operator/sriov-fec/pkg/common/utils"
+	fec "github.com/smart-edge-open/sriov-fec-operator/api/v2"
+	"github.com/smart-edge-open/sriov-fec-operator/pkg/common/utils"
 	"github.com/prometheus/client_golang/prometheus"
 	"github.com/prometheus/client_golang/prometheus/promhttp"
 	"github.com/sirupsen/logrus"

pkg/daemon/telemetry_test.go

@@ -2,8 +2,8 @@ package daemon
 
 import (
 	"fmt"
-	v2 "github.com/smart-edge-open/sriov-fec-operator/sriov-fec/api/v2"
-	"github.com/smart-edge-open/sriov-fec-operator/sriov-fec/pkg/common/utils"
+	v2 "github.com/smart-edge-open/sriov-fec-operator/api/v2"
+	"github.com/smart-edge-open/sriov-fec-operator/pkg/common/utils"
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
 	"github.com/prometheus/client_golang/prometheus/testutil"

spec/vran-accelerators-supported-by-operator.md

@@ -63,14 +63,11 @@ Intel® vRAN Dedicated Accelerator ACC100 card used in the FlexRAN solution expo
 The role of the operator for the Intel® vRAN Dedicated Accelerator ACC100 card is to orchestrate and manage the resources/devices exposed by the card within the OpenShift cluster. The operator is a state machine which will configure the resources and then monitor them and act autonomously based on the user interaction.
 The operator design for Intel® vRAN Dedicated Accelerator ACC100 consist of:
 
-<<<<<<< HEAD
-* [SRIOV-FEC Operator for Wireless FEC Accelerators](https://github.com/smart-edge-open/sriov-fec-operator/sriov-fec/blob/master/spec/sriov-fec-operator.md)
+* [SEO Operator for Wireless FEC Accelerators](https://github.com/smart-edge-open/sriov-fec-operator/blob/master/spec/sriov-fec-operator.md)
+
 
 # Intel® ACC200 vRAN Dedicated Accelerator
 
 The Intel® vRAN Dedicated Accelerator ACC200 peripheral enables cost-effective 4G and 5G next-generation virtualized Radio Access Network (vRAN) solutions integrated on Sapphire Rapids Edge Enhanced Processor (SPR-EE) Intel® 7 based Xeon® multi-core server processor.
 
 The ACC200 includes a 5G Low Density Parity Check (LDPC) encoder/decoder, rate match/dematch, Hybrid Automatic Repeat Request (HARQ) with access to DDR memory for buffer management, a 4G Turbo encoder/decoder, a Fast Fourier Transform (FFT) block providing DFT/iDFT processing offload for the 5G Sounding Reference Signal (SRS), a Queue Manager (QMGR), and a DMA subsystem. There is no dedicated on-card memory for HARQ, this is using coherent memory on the CPU side.
-=======
-* [SEO Operator for Wireless FEC Accelerators](https://github.com/smart-edge-open/sriov-fec-operator/blob/master/spec/openshift-sriov-fec-operator.md)
->>>>>>> main