Commit a3ae90d9 authored by YannGarcia's avatar YannGarcia
Browse files

Bug fixed in Dockerfile, Start Traffic Management API review

parent 125c42a7

Makefile

+9 −2
Original line number Diff line number Diff line
@@ -93,9 +93,16 @@ force_regen: 
	rm -f $(outdir)/.generate



t3q: all

	@echo "Code checking in progress..."

	@echo -e "Code checking in progress..."

	@java -Xmx3g -Xss512m -jar $(T3Q_PATH)/t3q.jar --config $(T3Q_PATH)/$(T3Q_CONFIG) $(tt_sources) > $(outdir)/t3q.out 2>&1 ; cd -

	@echo "Code checking in done"

	@echo -e "Code checking in done..."

	@echo -e "Output file is located here: $(outdir)/t3q.out"



t3d: all

	@echo -e "TTCN-3 doc generation in progress..."

	@java -Xmx3g -Xss512m -jar $(T3D_PATH)/t3d.jar --config $(T3D_PATH)/$(T3D_CONFIG) $(tt_sources) > $(outdir)/t3d.out 2>&1 ; cd -

	@echo -e "TTCN-3 doc generation done..."

	@echo -e "Output file is located here: $(outdir)/t3d.out"



$(outdir) $(bindir):

	mkdir -p $@

ccsrc/Protocols/Json/json_codec.cc

+16 −12
Original line number Diff line number Diff line
@@ -365,25 +365,29 @@ int json_codec::decode (const OCTETSTRING& p_data, LibItsHttp__JsonMessageBodyTy 
    UEAppInterfaceAPI__TypesAndValues::AppInfo appInfo;

    appInfo.decode(UEAppInterfaceAPI__TypesAndValues::AppInfo_descr_, decoding_buffer, TTCN_EncDec::CT_JSON);

    msg.appInfo() = appInfo;

  } else if (it->second.find("\"bwInfo\"") != std::string::npos) {

    BwManagementAPI__TypesAndValues::BwInfo bw_info;



  } else if ((it->second.find("\"bwInfo\"") != std::string::npos) || (it->second.find("\"fixedBWPriority\"") != std::string::npos)) {

    // Need to change some enumerated string not supported by TTCN-3 language

    if (str.find("not defined in the present document") != std::string::npos) {

      str = regex_replace(str, regex("not defined in the present document"), "not_defined_in_the_present_document");

    }

    if (str.find("00 = Downlink (towards the UE)") != std::string::npos) {

      str = regex_replace(str, regex("00 = Downlink \\(towards the UE\\)"), "Downlink");

    if (str.find("00") != std::string::npos) {

      str = regex_replace(str, regex("00"), "Downlink");

    } else if (str.find("01 = Uplink (towards the application/session)") != std::string::npos) {

      str = regex_replace(str, regex("01 = Uplink \\(towards the application\\/session\\)"), "Uplink");

      str = regex_replace(str, regex("01"), "Uplink");

    } else if (str.find("10 = Symmetrical") != std::string::npos) {

      str = regex_replace(str, regex("10 = Symmetrical"), "Symmetrical");

      str = regex_replace(str, regex("10"), "Symmetrical");

    }

    //loggers::get_instance().log("json_codec::decode: ##########; %s", str.c_str());



    if (it->second[0] == '[') { // BwInfoList

      TTCN_Buffer decoding_buffer_(OCTETSTRING(str.length(), (const unsigned char*)str.c_str()));

      BwManagementAPI__TypesAndValues::BwInfoList bw_info_list;

      bw_info_list.decode(BwManagementAPI__TypesAndValues::BwInfoList_descr_, decoding_buffer_, TTCN_EncDec::CT_JSON);

      msg.bwInfoList() = bw_info_list;

     } else {

      BwManagementAPI__TypesAndValues::BwInfo bw_info;

       TTCN_Buffer decoding_buffer_(OCTETSTRING(str.length(), (const unsigned char*)str.c_str()));

       bw_info.decode(BwManagementAPI__TypesAndValues::BwInfo_descr_, decoding_buffer_, TTCN_EncDec::CT_JSON);

       msg.bwInfo() = bw_info;

    }

  } else if (it->second.find("\"detail\"") != std::string::npos) {

    LibMec__TypesAndValues::ProblemDetails problem_details;

    problem_details.decode(LibMec__TypesAndValues::ProblemDetails_descr_, decoding_buffer, TTCN_EncDec::CT_JSON);

config.mk

+2 −1
Original line number Diff line number Diff line 
#TTCN3_DIR      := /cygdrive/c/Tools/Titan

#WPCAP_DLL_PATH := /cygdrive/c/windows/system32/npcap/wpcap.dll

#NPCAP_INCLUDE  := /cygdrive/c/PROGRA~1/Npcap/sdk/include

#T3Q=./tools/t3q-v2.0.0b30/t3q.bat

T3Q_PATH=./tools/t3q-v2.0.0b30

T3Q_CONFIG=t3q.cfg

T3D_PATH=./tools/t3d-v2.0.0b30

T3D_CONFIG=t3d.cfg

docker/Dockerfile

+2 −2
Original line number Diff line number Diff line
@@ -2,11 +2,11 @@ FROM stfubuntu:18.04 


MAINTAINER ETSI STF569



LABEL description="STF569_Mec Docker Image"

LABEL description="TTF_T012_Mec Docker Image"



ENV TERM=linux \

    HOME=/home/etsi \

    HOSTNAME=docker-titan-STF569

    HOSTNAME=docker-titan-TTF_T012



COPY home /home/etsi

docker/Dockerfile.stfubuntu

+3 −3
Original line number Diff line number Diff line
@@ -13,7 +13,7 @@ RUN echo "docker-STF-dev" > /etc/hostname \ 
    && DEBIAN_FRONTEND=noninteractive apt-get install software-properties-common -y \

    && DEBIAN_FRONTEND=noninteractive add-apt-repository ppa:linuxuprising/java -y \

    && DEBIAN_FRONTEND=noninteractive apt-get update \

    && ( echo "oracle-java14-installer shared/accepted-oracle-license-v1-2 boolean true" | debconf-set-selections -v ) \

    && ( echo "oracle-java15-installer shared/accepted-oracle-license-v1-2 boolean true" | debconf-set-selections -v ) \

    && DEBIAN_FRONTEND=noninteractive apt-get --allow-unauthenticated install -y \

      autoconf \

      bison \
@@ -48,8 +48,8 @@ RUN echo "docker-STF-dev" > /etc/hostname \ 
      lsof \

      net-tools \

      ntp \

      oracle-java14-installer \

      oracle-java14-set-default \

      oracle-java15-installer \

      oracle-java15-set-default \

      openssh-server \

      pkg-config \

      python3-dev \