From 4d0e07a80a63ea6e0590f3aa46f91ef6b52db8de Mon Sep 17 00:00:00 2001 From: zkoczka Date: Tue, 15 Oct 2019 15:05:57 +0200 Subject: [PATCH] add new packages to the container add additional platform routes Change-Id: I64077737d9d52c9985a8613b2f276e54f67733fa Signed-off-by: zkoczka --- Dockerfile | 1 + RELNOTES | 4 +++ container-tag.yaml | 2 +- pkg/rpe/rpe.go | 3 +++ pkg/rtmgr/rtmgr.go | 72 +++++++++++++++++++++++++++--------------------------- 5 files changed, 45 insertions(+), 37 deletions(-) diff --git a/Dockerfile b/Dockerfile index b876e94..ab40246 100644 --- a/Dockerfile +++ b/Dockerfile @@ -61,6 +61,7 @@ RUN go test ./pkg/sbi ./pkg/rpe ./pkg/nbi ./pkg/sdl -cover -race FROM ubuntu:16.04 COPY --from=rtmgrbuild /go/bin/rtmgr / COPY --from=rtmgrbuild /run_rtmgr.sh / +RUN apt update && apt install -y iputils-ping net-tools curl tcpdump RUN mkdir /db && touch /db/rt.json && chmod 777 /db/rt.json RUN chmod 755 /run_rtmgr.sh CMD /run_rtmgr.sh diff --git a/RELNOTES b/RELNOTES index 524e4ad..1c5d539 100644 --- a/RELNOTES +++ b/RELNOTES @@ -1,3 +1,7 @@ +### v0.3.5 +* Added platform route to send RIC_SCTP_CLEAR_ALL message to implement big red button. +* Added E2_TERM_INIT and RIC_SCTP_CONNECTION_FAILURE message type routes. + ### v0.3.4 * The following tools made available in the final docker image: iputils-ping, net-tools, curl and tcpdump diff --git a/container-tag.yaml b/container-tag.yaml index d2bab01..5c8ace1 100644 --- a/container-tag.yaml +++ b/container-tag.yaml @@ -2,4 +2,4 @@ # By default this file is in the docker build directory, # but the location can configured in the JJB template. --- -tag: 0.3.4 +tag: 0.3.5 diff --git a/pkg/rpe/rpe.go b/pkg/rpe/rpe.go index cfdf52c..fcda8fe 100644 --- a/pkg/rpe/rpe.go +++ b/pkg/rpe/rpe.go @@ -151,7 +151,9 @@ func (r *Rpe) generatePlatformRoutes(e2TermEp *rtmgr.Endpoint, subManEp *rtmgr.E r.addRoute("RIC_ENDC_X2_SETUP_REQ", e2ManEp, e2TermEp, routeTable, -1) r.addRoute("RIC_ENDC_X2_SETUP_RESP", e2ManEp, e2TermEp, routeTable, -1) r.addRoute("RIC_ENDC_X2_SETUP_FAILURE", e2ManEp, e2TermEp, routeTable, -1) + r.addRoute("RIC_SCTP_CLEAR_ALL", e2ManEp, e2TermEp, routeTable, -1) //E2 Termination -> E2 Manager + r.addRoute("E2_TERM_INIT", e2TermEp, e2ManEp, routeTable, -1) r.addRoute("RIC_X2_SETUP_REQ", e2TermEp, e2ManEp, routeTable, -1) r.addRoute("RIC_X2_SETUP_RESP", e2TermEp, e2ManEp, routeTable, -1) r.addRoute("RIC_X2_RESET", e2TermEp, e2ManEp, routeTable, -1) @@ -160,6 +162,7 @@ func (r *Rpe) generatePlatformRoutes(e2TermEp *rtmgr.Endpoint, subManEp *rtmgr.E r.addRoute("RIC_ENDC_X2_SETUP_REQ", e2ManEp, e2TermEp, routeTable, -1) r.addRoute("RIC_ENDC_X2_SETUP_RESP", e2ManEp, e2TermEp, routeTable, -1) r.addRoute("RIC_ENDC_X2_SETUP_FAILURE", e2ManEp, e2TermEp, routeTable, -1) + r.addRoute("RIC_SCTP_CONNECTION_FAILURE", e2TermEp, e2ManEp, routeTable, -1) } func (r *Rpe) generateRouteTable(endPointList rtmgr.Endpoints) *rtmgr.RouteTable { diff --git a/pkg/rtmgr/rtmgr.go b/pkg/rtmgr/rtmgr.go index 03e7c48..3189043 100644 --- a/pkg/rtmgr/rtmgr.go +++ b/pkg/rtmgr/rtmgr.go @@ -46,6 +46,9 @@ var ( "UEContextRelease": "5", "X2Setup": "6", "Reset": "7", + "RIC_SCTP_CONNECTION_FAILURE": "1080", + "RIC_SCTP_CLEAR_ALL": "1090", + "E2_TERM_INIT": "1100", "RIC_X2_SETUP": "10000", "RIC_X2_RESPONSE": "10001", "RIC_X2_RESOURCE_STATUS_REQUEST": "10002", @@ -55,44 +58,41 @@ var ( "RIC_E2_TERMINATION_HC_RESPONSE": "10006", "RIC_E2_MANAGER_HC_REQUEST": "10007", "RIC_E2_MANAGER_HC_RESPONSE": "10008", + "RIC_ENB_LOAD_INFORMATION": "10020", + "RIC_ERROR_INDICATION": "10030", + "RIC_X2_SETUP_REQ": "10060", + "RIC_X2_SETUP_RESP": "10061", + "RIC_X2_SETUP_FAILURE": "10062", + "RIC_X2_RESET": "10070", + "RIC_X2_RESET_RESP": "10071", + "RIC_ENB_CONF_UPDATE": "10080", + "RIC_ENB_CONF_UPDATE_ACK": "10081", + "RIC_ENB_CONF_UPDATE_FAILURE": "10082", + "RIC_RES_STATUS_REQ": "10090", + "RIC_RES_STATUS_RESP": "10091", + "RIC_RES_STATUS_FAILURE": "10092", + "RIC_RESOURCE_STATUS_UPDATE": "10100", + "RIC_ENDC_X2_SETUP_REQ": "10360", + "RIC_ENDC_X2_SETUP_RESP": "10361", + "RIC_ENDC_X2_SETUP_FAILURE": "10362", + "RIC_ENDC_CONF_UPDATE": "10370", + "RIC_ENDC_CONF_UPDATE_ACK": "10371", + "RIC_ENDC_CONF_UPDATE_FAILURE": "10372", + "RIC_GNB_STATUS_INDICATION": "10450", + "RIC_SUB_REQ": "12010", + "RIC_SUB_RESP": "12011", + "RIC_SUB_FAILURE": "12012", + "RIC_SUB_DEL_REQ": "12020", + "RIC_SUB_DEL_RESP": "12021", + "RIC_SUB_DEL_FAILURE": "12022", + "RIC_CONTROL_REQ": "12040", + "RIC_CONTROL_ACK": "12041", + "RIC_CONTROL_FAILURE": "12042", + "RIC_INDICATION": "12050", + "DC_ADM_INT_CONTROL": "20000", + "DC_ADM_INT_CONTROL_ACK": "20001", "RIC_CONTROL_XAPP_CONFIG_REQUEST": "100000", "RIC_CONTROL_XAPP_CONFIG_RESPONSE": "100001", - - "RIC_X2_SETUP_REQ": "10060", - "RIC_X2_SETUP_RESP": "10061", - "RIC_X2_SETUP_FAILURE": "10062", - "RIC_X2_RESET": "10070", - "RIC_X2_RESET_RESP": "10071", - - "RIC_SUB_REQ": "12010", - "RIC_SUB_RESP": "12011", - "RIC_SUB_FAILURE": "12012", - "RIC_SUB_DEL_REQ": "12020", - "RIC_SUB_DEL_RESP": "12021", - "RIC_SUB_DEL_FAILURE": "12022", - - "RIC_CONTROL_REQ": "12040", - "RIC_CONTROL_ACK": "12041", - "RIC_CONTROL_FAILURE": "12042", - "RIC_INDICATION": "12050", - "RIC_ENDC_X2_SETUP_REQ": "10360", - "RIC_ENDC_X2_SETUP_RESP": "10361", - "RIC_ENDC_X2_SETUP_FAILURE": "10362", - "RIC_ENDC_CONF_UPDATE": "10370", - "RIC_ENDC_CONF_UPDATE_ACK": "10371", - "RIC_ENDC_CONF_UPDATE_FAILURE": "10372", - "RIC_RES_STATUS_REQ": "10090", - "RIC_RES_STATUS_RESP": "10091", - "RIC_RES_STATUS_FAILURE": "10092", - "RIC_ENB_CONF_UPDATE": "10080", - "RIC_ENB_CONF_UPDATE_ACK": "10081", - "RIC_ENB_CONF_UPDATE_FAILURE": "10082", - "RIC_ENB_LOAD_INFORMATION": "10020", - "RIC_GNB_STATUS_INDICATION": "10450", - "RIC_RESOURCE_STATUS_UPDATE": "10100", - "RIC_ERROR_INDICATION": "10030", - "DC_ADM_INT_CONTROL": "20000", - "DC_ADM_INT_CONTROL_ACK": "20001", } // Messagetype mappings for the platform components. -- 2.16.6