From b6cbf3130d4bf546bb187a9730dc07d640726613 Mon Sep 17 00:00:00 2001 From: root Date: Mon, 5 Jul 2021 13:52:45 +0100 Subject: [PATCH 1/3] adding the xapp json file to be used in the demo a1-ric.sh --- xapp-json/qp-driver/config.json | 56 +++++++++++++++++++++++++++++++++ xapp-json/qp/config.json | 41 ++++++++++++++++++++++++ xapp-json/ts/config.json | 52 ++++++++++++++++++++++++++++++ 3 files changed, 149 insertions(+) create mode 100644 xapp-json/qp-driver/config.json create mode 100644 xapp-json/qp/config.json create mode 100644 xapp-json/ts/config.json diff --git a/xapp-json/qp-driver/config.json b/xapp-json/qp-driver/config.json new file mode 100644 index 00000000..54edcf58 --- /dev/null +++ b/xapp-json/qp-driver/config.json @@ -0,0 +1,56 @@ +{ + "xapp_name": "qpdriver", + "version": "1.1.0", + "containers": [ + { + "name": "qpdriver", + "image": { + "registry": "nexus3.o-ran-sc.org:10002", + "name": "o-ran-sc/ric-app-qp-driver", + "tag": "1.1.0" + } + } + ], + "messaging": { + "ports": [ + { + "name": "rmr-data", + "container": "qpdriver", + "port": 4560, + "rxMessages": [ + "TS_UE_LIST" + ], + "txMessages": [ + "TS_QOE_PRED_REQ", + "RIC_ALARM" + ], + "policies": [], + "description": "rmr receive data port for qpdriver" + }, + { + "name": "rmr-route", + "container": "qpdriver", + "port": 4561, + "description": "rmr route port for qpdriver" + } + ] + }, + "controls": { + "example_int": 10000, + "example_str": "value" + }, + "rmr": { + "protPort": "tcp:4560", + "maxSize": 2072, + "numWorkers": 1, + "rxMessages": [ + "TS_UE_LIST" + ], + "txMessages": [ + "TS_QOE_PRED_REQ", + "RIC_ALARM" + ], + "policies": [] + } + } + \ No newline at end of file diff --git a/xapp-json/qp/config.json b/xapp-json/qp/config.json new file mode 100644 index 00000000..1dc3d1f1 --- /dev/null +++ b/xapp-json/qp/config.json @@ -0,0 +1,41 @@ +{ + "xapp_name": "qp", + "version": "0.0.2", + "containers": [ + { + "name": "qp", + "image": { + "registry": "nexus3.o-ran-sc.org:10002", + "name": "o-ran-sc/ric-app-qp", + "tag": "0.0.3" + } + } + ], + "messaging": { + "ports": [ + { + "name": "rmr-data", + "container": "qp", + "port": 4560, + "rxMessages": ["TS_QOE_PRED_REQ"], + "txMessages": ["TS_QOE_PREDICTION"], + "policies": [], + "description": "rmr receive data port for qp" + }, + { + "name": "rmr-route", + "container": "qp", + "port": 4561, + "description": "rmr route port for qp" + } + ] + }, + "rmr": { + "protPort": "tcp:4560", + "maxSize": 2072, + "numWorkers": 1, + "rxMessages": ["TS_QOE_PRED_REQ"], + "txMessages": ["TS_QOE_PREDICTION"], + "policies": [] + } +} diff --git a/xapp-json/ts/config.json b/xapp-json/ts/config.json new file mode 100644 index 00000000..c766b73d --- /dev/null +++ b/xapp-json/ts/config.json @@ -0,0 +1,52 @@ +{ + "xapp_name": "trafficxapp", + "version": "1.0.0", + "containers": [ + { + "name": "trafficxapp", + "image": { + "registry": "nexus3.o-ran-sc.org:10002", + "name": "o-ran-sc/ric-app-ts", + "tag": "1.1.1" + } + } + ], + "messaging": { + "ports": [ + { + "name": "rmr-data", + "container": "trafficxapp", + "port": 4560, + "rxMessages": [ + "TS_QOE_PREDICTION", + "A1_POLICY_REQ", + "TS_ANOMALY_UPDATE" + ], + "txMessages": [ "TS_UE_LIST", "TS_ANOMALY_ACK" ], + "policies": [20008], + "description": "rmr receive data port for mcxapp" + }, + { + "name": "rmr-route", + "container": "trafficxapp", + "port": 4561, + "description": "rmr route port for mcxapp" + } + ] + }, + "rmr": { + "protPort": "tcp:4560", + "maxSize": 2072, + "numWorkers": 1, + "txMessages": [ + "TS_UE_LIST", + "TS_ANOMALY_ACK" + ], + "rxMessages": [ + "TS_QOE_PREDICTION", + "A1_POLICY_REQ", + "TS_ANOMALY_UPDATE" + ], + "policies": [20008] + } +} From 75ea5ddc6b5d7b3dac24da99016ba9054c83c35b Mon Sep 17 00:00:00 2001 From: soad666p Date: Tue, 6 Jul 2021 01:18:50 +0100 Subject: [PATCH 2/3] Revert "adding the xapp json file to be used in the demo a1-ric.sh" This reverts commit b6cbf3130d4bf546bb187a9730dc07d640726613. --- xapp-json/qp-driver/config.json | 56 --------------------------------- xapp-json/qp/config.json | 41 ------------------------ xapp-json/ts/config.json | 52 ------------------------------ 3 files changed, 149 deletions(-) delete mode 100644 xapp-json/qp-driver/config.json delete mode 100644 xapp-json/qp/config.json delete mode 100644 xapp-json/ts/config.json diff --git a/xapp-json/qp-driver/config.json b/xapp-json/qp-driver/config.json deleted file mode 100644 index 54edcf58..00000000 --- a/xapp-json/qp-driver/config.json +++ /dev/null @@ -1,56 +0,0 @@ -{ - "xapp_name": "qpdriver", - "version": "1.1.0", - "containers": [ - { - "name": "qpdriver", - "image": { - "registry": "nexus3.o-ran-sc.org:10002", - "name": "o-ran-sc/ric-app-qp-driver", - "tag": "1.1.0" - } - } - ], - "messaging": { - "ports": [ - { - "name": "rmr-data", - "container": "qpdriver", - "port": 4560, - "rxMessages": [ - "TS_UE_LIST" - ], - "txMessages": [ - "TS_QOE_PRED_REQ", - "RIC_ALARM" - ], - "policies": [], - "description": "rmr receive data port for qpdriver" - }, - { - "name": "rmr-route", - "container": "qpdriver", - "port": 4561, - "description": "rmr route port for qpdriver" - } - ] - }, - "controls": { - "example_int": 10000, - "example_str": "value" - }, - "rmr": { - "protPort": "tcp:4560", - "maxSize": 2072, - "numWorkers": 1, - "rxMessages": [ - "TS_UE_LIST" - ], - "txMessages": [ - "TS_QOE_PRED_REQ", - "RIC_ALARM" - ], - "policies": [] - } - } - \ No newline at end of file diff --git a/xapp-json/qp/config.json b/xapp-json/qp/config.json deleted file mode 100644 index 1dc3d1f1..00000000 --- a/xapp-json/qp/config.json +++ /dev/null @@ -1,41 +0,0 @@ -{ - "xapp_name": "qp", - "version": "0.0.2", - "containers": [ - { - "name": "qp", - "image": { - "registry": "nexus3.o-ran-sc.org:10002", - "name": "o-ran-sc/ric-app-qp", - "tag": "0.0.3" - } - } - ], - "messaging": { - "ports": [ - { - "name": "rmr-data", - "container": "qp", - "port": 4560, - "rxMessages": ["TS_QOE_PRED_REQ"], - "txMessages": ["TS_QOE_PREDICTION"], - "policies": [], - "description": "rmr receive data port for qp" - }, - { - "name": "rmr-route", - "container": "qp", - "port": 4561, - "description": "rmr route port for qp" - } - ] - }, - "rmr": { - "protPort": "tcp:4560", - "maxSize": 2072, - "numWorkers": 1, - "rxMessages": ["TS_QOE_PRED_REQ"], - "txMessages": ["TS_QOE_PREDICTION"], - "policies": [] - } -} diff --git a/xapp-json/ts/config.json b/xapp-json/ts/config.json deleted file mode 100644 index c766b73d..00000000 --- a/xapp-json/ts/config.json +++ /dev/null @@ -1,52 +0,0 @@ -{ - "xapp_name": "trafficxapp", - "version": "1.0.0", - "containers": [ - { - "name": "trafficxapp", - "image": { - "registry": "nexus3.o-ran-sc.org:10002", - "name": "o-ran-sc/ric-app-ts", - "tag": "1.1.1" - } - } - ], - "messaging": { - "ports": [ - { - "name": "rmr-data", - "container": "trafficxapp", - "port": 4560, - "rxMessages": [ - "TS_QOE_PREDICTION", - "A1_POLICY_REQ", - "TS_ANOMALY_UPDATE" - ], - "txMessages": [ "TS_UE_LIST", "TS_ANOMALY_ACK" ], - "policies": [20008], - "description": "rmr receive data port for mcxapp" - }, - { - "name": "rmr-route", - "container": "trafficxapp", - "port": 4561, - "description": "rmr route port for mcxapp" - } - ] - }, - "rmr": { - "protPort": "tcp:4560", - "maxSize": 2072, - "numWorkers": 1, - "txMessages": [ - "TS_UE_LIST", - "TS_ANOMALY_ACK" - ], - "rxMessages": [ - "TS_QOE_PREDICTION", - "A1_POLICY_REQ", - "TS_ANOMALY_UPDATE" - ], - "policies": [20008] - } -} From 00cb0ab785f675f39c1da5352f20187496e4e1f2 Mon Sep 17 00:00:00 2001 From: Berchris Requiao Date: Wed, 7 Jul 2021 13:32:33 +0100 Subject: [PATCH 3/3] Fix error 'unknown flag: --force-update' --- bin/deploy-nonrtric | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/bin/deploy-nonrtric b/bin/deploy-nonrtric index 02846c67..290c41d4 100755 --- a/bin/deploy-nonrtric +++ b/bin/deploy-nonrtric @@ -56,8 +56,16 @@ echo "** $ROOT_DIR" rm $ROOT_DIR/../nonrtric/helm/*/charts/*.tgz -#Check for helm3 -IS_HELM3=$(helm version -c --short|grep -e "^v3") +#Check for helm version +HELM_VERSION=$(helm version -c --short) +IS_HELM3=$(echo $HELM_VERSION | grep -e "^v3") +HELM_NUMBER=$(echo $HELM_VERSION | awk '{gsub(/\./,"",$1); print substr($1,2,3)}') + +HELM_FORCE="" +if [[ HELM_NUMBER -ge 332 ]] +then + HELM_FORCE="--force-update" +fi if [ $IS_HELM3 ] then @@ -120,7 +128,7 @@ helm dep up $ROOT_DIR/../nonrtric/helm/nonrtric helm repo index ${HELM_LOCAL_REPO} # Make sure that helm local repo is added -helm repo add local http://127.0.0.1:8879/charts --force-update +helm repo add local http://127.0.0.1:8879/charts ${HELM_FORCE} echo "Finished Packaging NONRTRIC components [$COMPONENTS]" @@ -144,7 +152,7 @@ echo "Install Kong- $INSTALL_KONG" if [ "$INSTALL_KONG" = true ];then echo "Installing Kong" - helm repo add kong https://charts.konghq.com --force-update + helm repo add kong https://charts.konghq.com ${HELM_FORCE} helm repo update helm install kong-nonrtric --namespace ${NONRTRIC_NAMESPACE:-nonrtric} kong/kong --set ingressController.installCRDs=false --set admin.enabled=true fi