Add UEidentityAPI support (3c059675) · Commits · MEC - Multi-access Edge Computing / MEC TTCN-3 Test Suite

ccsrc/Protocols/Json/json_codec.cc

+7 −3

Original line number	Original line	Diff line number	Diff line
	@@ -48,10 +48,14 @@ int json_codec::decode (const OCTETSTRING& p_data, LibItsHttp__JsonMessageBodyTy
	// ..and create the decoding buffer		// ..and create the decoding buffer
	TTCN_Buffer decoding_buffer(OCTETSTRING(str.length(), (const unsigned char*)str.c_str()));		TTCN_Buffer decoding_buffer(OCTETSTRING(str.length(), (const unsigned char*)str.c_str()));

	if (it->second.find("{\"userInfo\"") != std::string::npos) {		if (it->second.find("\"userInfo\"") != std::string::npos) {
	LocationAPI__TypesAndValues::UserInfo user_info;		LocationAPI__TypesAndValues::UserInfo user_info;
	user_info.decode(LocationAPI__TypesAndValues::UserInfo_descr_, decoding_buffer, TTCN_EncDec::CT_JSON);		user_info.decode(LocationAPI__TypesAndValues::UserInfo_descr_, decoding_buffer, TTCN_EncDec::CT_JSON);
	msg.userInfo() = user_info;		msg.userInfo() = user_info;
			} else if (it->second.find("\"ueIdentityTagInfo\"") != std::string::npos) {
			UEidentityAPI__TypesAndValues::UeIdentityTagInfo ue_identity_tag_info;
			ue_identity_tag_info.decode(UEidentityAPI__TypesAndValues::UeIdentityTagInfo_descr_, decoding_buffer, TTCN_EncDec::CT_JSON);
			msg.ueIdentityTagInfo() = ue_identity_tag_info;
	} else {		} else {
	loggers::get_instance().warning("json_codec::decode: Unsupported variant");		loggers::get_instance().warning("json_codec::decode: Unsupported variant");
	return -1;		return -1;

docker/Dockerfile

+17 −17

Original line number	Original line	Diff line number	Diff line
	FROM ubuntu:18.04		FROM ubuntu:18.04

	MAINTAINER ETSI STF 549		MAINTAINER ETSI STF 569

	LABEL description="STF549 Docker Image"		LABEL description="STF569 Docker Image"

	ENV TERM=xterm		ENV TERM=xterm
	ENV HOSTNAME docker-titan-STF549		ENV HOSTNAME docker-titan-STF569

	RUN DEBIAN_FRONTEND=noninteractive apt-get update \		RUN DEBIAN_FRONTEND=noninteractive apt-get update \
	&& DEBIAN_FRONTEND=noninteractive apt-get install software-properties-common -y \		&& DEBIAN_FRONTEND=noninteractive apt-get install software-properties-common -y \
	@@ -66,7 +66,7 @@ RUN DEBIAN_FRONTEND=noninteractive apt-get update \
	&& DEBIAN_FRONTEND=noninteractive apt-get autoclean \		&& DEBIAN_FRONTEND=noninteractive apt-get autoclean \
	&& rm -rf /var/lib/apt/lists/*		&& rm -rf /var/lib/apt/lists/*

	RUN echo "docker-titan-STF549" > /etc/hostname \		RUN echo "docker-titan-STF569" > /etc/hostname \
	&& echo "root:etsi" \| chpasswd		&& echo "root:etsi" \| chpasswd

	RUN useradd --create-home --shell /bin/bash --user-group etsi --groups sudo \		RUN useradd --create-home --shell /bin/bash --user-group etsi --groups sudo \
	@@ -76,7 +76,7 @@ RUN useradd --create-home --shell /bin/bash --user-group etsi --groups sudo \
	RUN cd /home/etsi \		RUN cd /home/etsi \
	&& echo "" >> /home/etsi/.bashrc \		&& echo "" >> /home/etsi/.bashrc \
	&& echo "export HOME=/home/etsi" >> /home/etsi/.bashrc \		&& echo "export HOME=/home/etsi" >> /home/etsi/.bashrc \
	&& echo "export LD_LIBRARY_PATH=/home/etsi/dev/etsi_emcom/lib:$LD_LIBRARY_PATH" >> /home/etsi/.bashrc \		&& echo "export LD_LIBRARY_PATH=/home/etsi/dev/etsi_mec/lib:$LD_LIBRARY_PATH" >> /home/etsi/.bashrc \
	&& echo "export PATH=/home/etsi/bin:$PATH" >> /home/etsi/.bashrc \		&& echo "export PATH=/home/etsi/bin:$PATH" >> /home/etsi/.bashrc \
	&& echo "cd /home/etsi" >> /home/etsi/.bashrc \		&& echo "cd /home/etsi" >> /home/etsi/.bashrc \
	&& echo ". ./devenv.bash" >> /home/etsi/.bashrc \		&& echo ". ./devenv.bash" >> /home/etsi/.bashrc \
	@@ -87,10 +87,10 @@ RUN cd /home/etsi \

	# Seems that COPY does not work as expected, to be investaged		# Seems that COPY does not work as expected, to be investaged
	#==> Fallback to more secured solution		#==> Fallback to more secured solution
	#COPY [^.]* /home/etsi/dev/STF549_Ng112/		#COPY [^.]* /home/etsi/dev/STF569_Mec/
	#COPY home home/etsi		#COPY home home/etsi
	RUN git clone https://forge.etsi.org/gitlab/emergency-communications/NG112.git /home/etsi/dev/STF549_Ng112		RUN git clone https://forge.etsi.org/gitlab/garciay/MEC.git /home/etsi/dev/STF569_Mec
	RUN chown -R etsi /home/etsi/dev/STF549_Ng112/ && cd /home/etsi/dev/STF549_Ng112		RUN chown -R etsi /home/etsi/dev/STF569_Mec/ && cd /home/etsi/dev/STF569_Mec

	USER etsi		USER etsi

	@@ -105,27 +105,27 @@ RUN cd /home/etsi/frameworks \
	&& wget -q 'http://ftp.halifax.rwth-aachen.de/eclipse//technology/epp/downloads/release/oxygen/2/eclipse-cpp-oxygen-2-linux-gtk-x86_64.tar.gz' -Oeclipse-cpp-oxygen-2-linux-gtk-x86_64.tar.gz \		&& wget -q 'http://ftp.halifax.rwth-aachen.de/eclipse//technology/epp/downloads/release/oxygen/2/eclipse-cpp-oxygen-2-linux-gtk-x86_64.tar.gz' -Oeclipse-cpp-oxygen-2-linux-gtk-x86_64.tar.gz \
	&& tar -zxvf ./eclipse-cpp-oxygen-2-linux-gtk-x86_64.tar.gz \		&& tar -zxvf ./eclipse-cpp-oxygen-2-linux-gtk-x86_64.tar.gz \
	&& rm -f ./eclipse-cpp-oxygen-2-linux-gtk-x86_64.tar.gz \		&& rm -f ./eclipse-cpp-oxygen-2-linux-gtk-x86_64.tar.gz \
	&& cd /home/etsi/dev/STF549_Ng112 \		&& cd /home/etsi/dev/STF569_Mec \
	&& cd /home/etsi/dev/STF549_Ng112/ttcn \		&& cd /home/etsi/dev/STF569_Mec/ttcn \
	&& git clone https://forge.etsi.org/gitlab/LIBS/LibSip.git ./LibSip \		&& git clone https://forge.etsi.org/gitlab/LIBS/LibSip.git ./LibSip \
	&& git clone https://forge.etsi.org/gitlab/LIBS/LibIms.git ./LibIms \		&& git clone https://forge.etsi.org/gitlab/LIBS/LibIms.git ./LibIms \
	&& git clone https://forge.etsi.org/gitlab/LIBS/LibCommon.git ./LibCommon \		&& git clone https://forge.etsi.org/gitlab/LIBS/LibCommon.git ./LibCommon \
	&& git clone -bSTF525 https://forge.etsi.org/gitlab/LIBS/LibIts ./LibIts \		&& git clone -bSTF525 https://forge.etsi.org/gitlab/LIBS/LibIts ./LibIts \
	&& cd /home/etsi/dev/STF549_Ng112/ttcn/LibIts \		&& cd /home/etsi/dev/STF569_Mec/ttcn/LibIts \
	&& rm -fr asn1 t3q xsd \		&& rm -fr asn1 t3q xsd \
	&& cd ttcn && rm -fr BTP CALM CAM Common DCC DENM GeoNetworking Ipv6OverGeoNetworking IVIM MapemSpatem Pki Security SremSsem V2G \		&& cd ttcn && rm -fr BTP CALM CAM Common DCC DENM GeoNetworking Ipv6OverGeoNetworking IVIM MapemSpatem Pki Security SremSsem V2G \
	&& cd /home/etsi/dev/STF549_Ng112/scripts \		&& cd /home/etsi/dev/STF569_Mec/scripts \
	&& chmod 775 .bash devenv.bash. \		&& chmod 775 .bash devenv.bash. \
	&& cd /home/etsi \		&& cd /home/etsi \
	&& ln -sf /home/etsi/dev/STF549_Ng112/scripts/devenv.bash.ubuntu /home/etsi/devenv.bash \		&& ln -sf /home/etsi/dev/STF569_Mec/scripts/devenv.bash.ubuntu /home/etsi/devenv.bash \
	&& ls -ltr /home/etsi \		&& ls -ltr /home/etsi \
	&& export HOME=/home/etsi \		&& export HOME=/home/etsi \
	&& . /home/etsi/devenv.bash \		&& . /home/etsi/devenv.bash \
	&& cd /home/etsi/dev/STF549_Ng112/scripts \		&& cd /home/etsi/dev/STF569_Mec/scripts \
	&& ./build_titan.bash \		&& ./build_titan.bash \
	&& . /home/etsi/devenv.bash \		&& . /home/etsi/devenv.bash \
	&& ./update_emcom_project.bash \		&& ./update_mec_project.bash \
	&& cd /home/etsi/dev/etsi_emcom/src/AtsNg112/objs \		&& cd /home/etsi/dev/etsi_mec/src/AtsMec/objs \
	&& ../bin/ng112_generate_makefile.bash		&& ../bin/mec_generate_makefile.bash

	# That's all Floks		# That's all Floks

etc/AtsMec/AtsMec_LocationAPI.cfg

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -9,7 +9,7 @@ LibCommon_Sync.PX_TSHUT_DOWN_TIME_LIMIT := 30.0;

	LibItsHttp_Pics.PICS_HEADER_HOST := "192.168.0.5"		LibItsHttp_Pics.PICS_HEADER_HOST := "192.168.0.5"

	LibItsHttp_Pics.PICS_HEADER_CONTENT_TYPE := "application/json;charset=utf-8"		LibItsHttp_Pics.PICS_HEADER_CONTENT_TYPE := "application/json"

	LibMec_Pics.PICS_ME_APP_IUT := true		LibMec_Pics.PICS_ME_APP_IUT := true

scripts/mec_generate_makefile.bash

+2 −2

Original line number	Original line	Diff line number	Diff line
	@@ -52,7 +52,7 @@ find .. -type f -name "*.bak" -exec rm {} \;
	find .. -type f -name "*.log" -exec rm {} \;		find .. -type f -name "*.log" -exec rm {} \;

	# Build JSON files if any and put them in objs directory		# Build JSON files if any and put them in objs directory
	REFERENCES="LibCommon LibHttp LibMec LibMec/LocationAPI"		REFERENCES="LibCommon LibHttp LibMec LibMec/LocationAPI LibMec/UEidentityAPI"
	for i in ${REFERENCES}		for i in ${REFERENCES}
	do		do
	# TTCN code		# TTCN code
	@@ -166,7 +166,7 @@ else
	fi		fi
	LDFLAGS_DEBUG_MODE='s/LDFLAGS = /LDFLAGS = -g -pthread -fPIC -fstack-check -fstack-protector -fsanitize=leak -fsanitize=address -fno-omit-frame-pointer/g'		LDFLAGS_DEBUG_MODE='s/LDFLAGS = /LDFLAGS = -g -pthread -fPIC -fstack-check -fstack-protector -fsanitize=leak -fsanitize=address -fno-omit-frame-pointer/g'
	fi		fi
	ADD_INCLUDE='/CPPFLAGS = /a\\CPPFLAGS += -I/usr/local/share -I$(PATH_DEV_MEC)/include -I$(PATH_DEV_MEC)/framework/include -I../include -I../../LibEmcom/Common/include -I../../LibEmcom/LibMec/include -I$(HOME_FRAMEWORKS)/osip/include -I$(HOME_INC) -I.'		ADD_INCLUDE='/CPPFLAGS = /a\\CPPFLAGS += -I/usr/local/share -I$(PATH_DEV_MEC)/include -I$(PATH_DEV_MEC)/framework/include -I../include -I../../LibMec/Common/include -I../../LibMec/include -I$(HOME_FRAMEWORKS)/osip/include -I$(HOME_INC) -I.'
	ADD_LIBRARIES='s/LINUX_LIBS = -lxml2/LINUX_LIBS = -lrt -lxml2 -lpcap -lstdc++fs -lssl -L\$$HOME_FRAMEWORKS$\/osip\/src\/osipparser2\/\.libs -losipparser2/g'		ADD_LIBRARIES='s/LINUX_LIBS = -lxml2/LINUX_LIBS = -lrt -lxml2 -lpcap -lstdc++fs -lssl -L\$$HOME_FRAMEWORKS$\/osip\/src\/osipparser2\/\.libs -losipparser2/g'
	sed --in-place "${CXXFLAGS_DEBUG_MODE}" ./Makefile		sed --in-place "${CXXFLAGS_DEBUG_MODE}" ./Makefile
	sed --in-place "${LDFLAGS_DEBUG_MODE}" ./Makefile		sed --in-place "${LDFLAGS_DEBUG_MODE}" ./Makefile

scripts/merge_mec_project.bash

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -158,7 +158,7 @@ done
	echo 'Update TTCN-3 files'		echo 'Update TTCN-3 files'
	TTCN_3_ORG_PATH=${SRC_MEC_PATH}/ttcn		TTCN_3_ORG_PATH=${SRC_MEC_PATH}/ttcn
	TTCN_3_DST_PATH=${PATH_DEV_MEC}/src		TTCN_3_DST_PATH=${PATH_DEV_MEC}/src
	TTCN_3_ATS_LIST='AtsNg112 LibMec LibMec/LocationAPI LibCommon LibHttp'		TTCN_3_ATS_LIST='AtsNg112 LibMec LibMec/LocationAPI LibMec/UEidentityAPI LibHttp LibCommon'
	for i in ${TTCN_3_ATS_LIST}		for i in ${TTCN_3_ATS_LIST}
	do		do
	# TTCN-3 files		# TTCN-3 files

Admin message