Add container tag and Fixing UT and configuration.

Adding Container tag and Fixing UT SetPolicyInstance and fixing Dockerfile for configuration.

Signed-off-by: naman.gupta <naman.gupta@samsung.com>
Change-Id: I42b5c87c41a2efc25ac1cd63bc53e969882de28f

diff --git a/Dockerfile b/Dockerfile
index a9e6c15..6479928 100644 (file)
--- a/Dockerfile
+++ b/Dockerfile
@@ -64,9 +64,8 @@ RUN GO111MODULE=on go mod download
 # build and test
 COPY . /go/src/ws
 COPY  ./config/config_test.yaml /opt/a1-mediator/
-COPY  ./config/config_rmr.json /opt/a1-mediator/
 
-ENV CFG_FILE=/opt/a1-mediator/config-_rmr.json
+ENV CFG_FILE=/opt/a1-mediator/config_test.yaml
 ENV A1_CONFIG_FILE=/opt/a1-mediator/config_test.yaml
 
 
@@ -110,16 +109,16 @@ RUN mkdir -p /opt/a1-mediator \
 COPY --from=a1-build /go/src/ws/cache/go/cmd/a1 /opt/a1-mediator/a1
 
 COPY  ./config/config.yaml /opt/a1-mediator/
-COPY  ./config/config_rmr.json /opt/a1-mediator/
 
 WORKDIR /opt/a1-mediator
 
-ARG RMR_CONFIG=/opt/a1-mediator/config-_rmr.json
-ENV CFG_FILE=$RMR_CONFIG
+ARG CONFIG=/opt/a1-mediator/config.yaml
+ENV CFG_FILE=$CONFIG
 ARG A1_CONFIG=/opt/a1-mediator/config.yaml
 ENV A1_CONFIG_FILE=$A1_CONFIG
 
 
 COPY a1-entrypoint.sh /opt/a1-mediator/
+RUN chmod -R 755 /opt/a1-mediator/a1-entrypoint.sh
 ENTRYPOINT ["/opt/a1-mediator/a1-entrypoint.sh"]
 

diff --git a/container-tag.yaml b/container-tag.yaml
new file mode 100644 (file)
index 0000000..c4a346e
--- /dev/null
+++ b/container-tag.yaml
@@ -0,0 +1,4 @@
+# The Jenkins job uses this string for the tag in the image name\r
+# for example nexus3.o-ran-sc.org:10004/my-image-name:my-tag\r
+---\r
+tag: 3.0.0\r

diff --git a/pkg/policy/policyManager_test.go b/pkg/policy/policyManager_test.go
index 42a9807..003cd67 100644 (file)
--- a/pkg/policy/policyManager_test.go
+++ b/pkg/policy/policyManager_test.go
@@ -54,7 +54,7 @@ func TestSetPolicyInstance(t *testing.T) {
        status = "OK"
        instancehandlerKey := a1HandlerPrefix + strconv.FormatInt(20001, 10) + "." + strconv.FormatInt(int64(policyInstanceID), 10)
        instancearr := []interface{}{instancehandlerKey, status}
-       sdlInst.On("Set", "A1m_ns", instancehandlerKey, instancearr).Return(nil)
+       sdlInst.On("Set", "A1m_ns", instancearr).Return(nil)
        errresp := pm.SetPolicyInstanceStatus(policyTypeId, policyInstanceID, status)
        assert.NoError(t, errresp)
        sdlInst.AssertExpectations(t)