Commit 58c0b762 authored by Yann Garcia's avatar Yann Garcia
Browse files

Bug fixed in multi-component creation

parent d83db2fb

docker/Dockerfile

+1 −2
Original line number Diff line number Diff line
@@ -105,9 +105,7 @@ 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 \

    && tar -zxvf ./eclipse-cpp-oxygen-2-linux-gtk-x86_64.tar.gz \

    && rm -f ./eclipse-cpp-oxygen-2-linux-gtk-x86_64.tar.gz \

    && find $HOME -name "*" \

    && cd /home/etsi/dev/STF549_Ng112 \

    && ls \

    && cd /home/etsi/dev/STF549_Ng112/ttcn \

    && git clone https://forge.etsi.org/gitlab/LIBS/LibSip.git ./LibSip \

    && git clone https://forge.etsi.org/gitlab/LIBS/LibIms.git ./LibIms \
@@ -125,6 +123,7 @@ RUN cd /home/etsi/frameworks \ 
    && . /home/etsi/devenv.bash \

    && cd /home/etsi/dev/STF549_Ng112/scripts \

    && ./build_titan.bash \

    && . /home/etsi/devenv.bash \

    && ./update_emcom_project.bash \

    && cd /home/etsi/dev/etsi_emcom/src/AtsNg112/objs \

    && find /home/etsi/dev/etsi_emcom -type f -name "*.ttcn" -exec grep timestamp {} \; \

etc/AtsNg112/AtsNg112.cfg

+2 −1
Original line number Diff line number Diff line
@@ -41,7 +41,8 @@ LogEventTypes:= Yes 
# ECRF

system.httpPort.params := "HTTP(codecs=lost:lost_codec;held:held_codec)/TCP(debug=1,server=ecrf.gridgears.io,use_ssl=1)"

# SIP

system.SIPP.params := "SIP/UDP(dst_ip=127.0.0.1,dst_port=5060,src_ip=10.10.33.253,src_port=5060)"

Ue.SIPP.params := "SIP/UDP(dst_ip=192.168.43.132,dst_port=5060)"

Psap.SIPP.params := "SIP/UDP(dst_ip=192.168.43.132,dst_port=5061)"



[DEFINE]

# In this section you can create macro definitions,

ttcn/LibEmcom/LibNg112/ttcn/LibNg112_Functions.ttcn

+5 −5
Original line number Diff line number Diff line
@@ -42,8 +42,8 @@ module LibNg112_Functions { 
                          out HttpComponent p_ecrf,

                          out ImsComponent p_psap

                          ) runs on HttpImsComponent {

        p_ecrf := HttpComponent.create alive;

        p_psap := ImsComponent.create alive;

        p_ecrf := HttpComponent.create("Ecrf") alive;

        p_psap := ImsComponent.create("Psap") alive;

        

        connect(p_ecrf:syncPort, self:syncPort);

        connect(p_psap:syncPort, self:syncPort);
@@ -57,9 +57,9 @@ module LibNg112_Functions { 
                          out ImsComponent p_ue,

                          out ImsComponent p_psap

                          ) runs on HttpImsComponent {

        p_ecrf := HttpComponent.create alive;

        p_ue := ImsComponent.create alive;

        p_psap := ImsComponent.create alive;

        p_ecrf := HttpComponent.create("Ecrf") alive;

        p_ue := ImsComponent.create("Ue") alive;

        p_psap := ImsComponent.create("Psap") alive;

        

        connect(p_ecrf:syncPort, self:syncPort);

        connect(p_ue:syncPort, self:syncPort);