Fixed the Build Issues

Signed-off-by: praneeth2021 <vpraneethkumar@gmail.com>
Change-Id: Iea58d8fccce10843c4f2397b238fbb4f7556b252

Signed-off-by: praneeth2021 <vpraneethkumar@gmail.com>
Change-Id: Ibbcf5ffc1911346eb569f8c6c25f64bd8336ae4d

diff --git a/Dockerfile b/Dockerfile
index 9630214..87a45d0 100644 (file)
--- a/Dockerfile
+++ b/Dockerfile
@@ -23,7 +23,7 @@ RUN cd xapp-frame && \
     cp -r vendor/* /go/src/ && \
     rm -rf vendor
 
-WORKDIR /go/src/gerrit.o-ran-sc.org/r/ric-app
+WORKDIR /go/src/gerrit.o-ran-sc.org/r/ric-app/rc
 COPY go.mod .
 COPY go.sum .
 COPY cmd cmd
@@ -62,6 +62,6 @@ FROM ubuntu:18.04
 ENV CFG_FILE /opt/ric/config/config-file.json
 COPY --from=rcbuild /usr/local/lib /usr/local/lib
 RUN ldconfig
-WORKDIR /go/src/gerrit.o-ran-sc.org/r/ric-app
-COPY --from=rcbuild /go/src/gerrit.o-ran-sc.org/r/ric-app/rc .
+WORKDIR /go/src/gerrit.o-ran-sc.org/r/ric-app/rc
+COPY --from=rcbuild /go/src/gerrit.o-ran-sc.org/r/ric-app/rc/rc .
 CMD ./rc

diff --git a/cmd/rc.go b/cmd/rc.go
index 743894b..e7681a1 100644 (file)
--- a/cmd/rc.go
+++ b/cmd/rc.go
@@ -1,7 +1,7 @@
 package main
 
 import (
-       "gerrit.o-ran-sc.org/r/scp/ric-app/control"
+       "gerrit.o-ran-sc.org/r/ric-app/rc/control"
 )
 
 func main() {

diff --git a/control/grpcserver.go b/control/grpcserver.go
index a30770e..009b83d 100644 (file)
--- a/control/grpcserver.go
+++ b/control/grpcserver.go
@@ -2,7 +2,7 @@ package control
 
 import (
        "gerrit.o-ran-sc.org/r/ric-plt/xapp-frame/pkg/xapp"
-       "gerrit.o-ran-sc.org/r/scp/ric-app/protocol/grpc/ricmsgcommrpc/rc"
+       "gerrit.o-ran-sc.org/r/ric-app/rc/protocol/grpc/ricmsgcommrpc/rc"
        "google.golang.org/grpc"
        "google.golang.org/grpc/health"
        "google.golang.org/grpc/health/grpc_health_v1"

diff --git a/control/rcControl.go b/control/rcControl.go
index 7570d0b..27bdc76 100644 (file)
--- a/control/rcControl.go
+++ b/control/rcControl.go
@@ -4,7 +4,7 @@ import (
        "errors"\r
        "fmt"\r
        "gerrit.o-ran-sc.org/r/ric-plt/xapp-frame/pkg/xapp"\r
-       "gerrit.o-ran-sc.org/r/scp/ric-app/protocol/grpc/ricmsgcommrpc/rc"\r
+       "gerrit.o-ran-sc.org/r/ric-app/rc/protocol/grpc/ricmsgcommrpc/rc"\r
        "log"\r
        "os"\r
        "strconv"\r

diff --git a/control/rcService.go b/control/rcService.go
index 39175e9..4a087e4 100644 (file)
--- a/control/rcService.go
+++ b/control/rcService.go
@@ -7,7 +7,7 @@ import (
        "time"
 
        "gerrit.o-ran-sc.org/r/ric-plt/xapp-frame/pkg/xapp"
-       "gerrit.o-ran-sc.org/r/scp/ric-app/protocol/grpc/ricmsgcommrpc/rc"
+       "gerrit.o-ran-sc.org/r/ric-app/rc/protocol/grpc/ricmsgcommrpc/rc"
        "golang.org/x/net/context"
 )
 

diff --git a/control/rcTypes.go b/control/rcTypes.go
index 7e9f73e..0204451 100644 (file)
--- a/control/rcTypes.go
+++ b/control/rcTypes.go
@@ -2,7 +2,7 @@ package control
 \r
 import (\r
        "gerrit.o-ran-sc.org/r/ric-plt/xapp-frame/pkg/xapp"\r
-       rc "gerrit.o-ran-sc.org/r/scp/ric-app/protocol/grpc/ricmsgcommrpc/rc"\r
+       rc "gerrit.o-ran-sc.org/r/ric-app/rc/protocol/grpc/ricmsgcommrpc/rc"\r
        "sync"\r
 )\r
 \r

diff --git a/go.mod b/go.mod
index 9f3d1c0..311de3d 100644 (file)
--- a/go.mod
+++ b/go.mod
@@ -1,4 +1,3 @@
-//module gerrit.o-ran-sc.org/r/scp/ric-app
 module nrtric 
 
 go 1.14
@@ -25,6 +24,6 @@ replace gerrit.o-ran-sc.org/r/ric-plt/nodeb-rnib.git/reader => gerrit.o-ran-sc.o
 
 replace gerrit.o-ran-sc.org/r/ric-plt/alarm-go.git/alarm => gerrit.o-ran-sc.org/r/ric-plt/alarm-go.git/alarm v0.5.0
 
-replace gerrit.o-ran-sc.org/r/scp/ric-app/control => /go/src/gerrit.o-ran-sc.org/r/scp/ric-app/control
+replace gerrit.o-ran-sc.org/r/ric-app/rc/control => /go/src/gerrit.o-ran-sc.org/r/ric-app/rc/control
 
-replace gerrit.o-ran-sc.org/r/scp/ric-app/protocol/grpc/ricmsgcommrpc/rc => /go/src/gerrit.o-ran-sc.org/r/scp/ric-app/protocol/grpc/ricmsgcommrpc/rc
+replace gerrit.o-ran-sc.org/r/ric-app/rc/protocol/grpc/ricmsgcommrpc/rc => /go/src/gerrit.o-ran-sc.org/r/ric-app/rc/protocol/grpc/ricmsgcommrpc/rc

diff --git a/xapp-descriptor/config.json b/xapp-descriptor/config.json
index adae08c..a0dbd79 100644 (file)
--- a/xapp-descriptor/config.json
+++ b/xapp-descriptor/config.json
@@ -7,7 +7,7 @@
       "name": "rc",\r
       "image": {\r
         "registry": "nexus3.o-ran-sc.org:10002",\r
-        "name": "o-ran-sc/scp-ric-app-rc",\r
+        "name": "o-ran-sc/ric-app-rc",\r
         "tag": "1.0.0"\r
       }\r
     }\r