Commit 26b5eb52 authored by YannGarcia's avatar YannGarcia
Browse files

Reporting bug fixes from MEC-10-2 PkgMgt TPs

parent 61d535a5

README.md

+15 −1
Original line number Diff line number Diff line
@@ -204,10 +204,24 @@ Procedure: 
- Clone the ETSI MEC Testing Framework project into $HOME/dev folder



```sh

$ git clone 

$ git clone --recurse-submodules --branch TTF012_Mec https://forge.etsi.org/rep/mec/gs032p3-ttcn-test-suite.git ./TTF012_Mec

$ cd /home/etsi/dev/TTF012_Mec/ttcn/LibIts

$ rm -fr t3q

$ cd ttcn && rm -fr Common

```



- Apply patches



```sh

$ cd /home/etsi/dev/TTF012_Mec

$ cp ./ttcn/patch_lib_common_titan/module.mk ./ttcn/LibCommon/

$ cp ./ttcn/patch_lib_common_titan/*.ttcn ./ttcn/LibCommon/

$ cp ./ttcn/patch_lib_http/*.ttcn ./ttcn/LibIts/ttcn/Http/

$ cp  ./ttcn/patch_lib_its/module.mk ./ttcn/LibIts/

```



- Update your default environment with the content of the script $HOME/dev/TTF012_Mec/scripts/devenv.bash.ubuntu



- Switch to the next clause (Usage)

scripts/update_user_name.sh

+2 −2
Original line number Diff line number Diff line
@@ -7,8 +7,8 @@ 
# Usage: sudo ./update_user_name.bash

# TODO Use git clone in temporary directory



USER_NAME='s/vagrant/etsi/g'

for i in `find /home/etsi/dev/$1_Its -name "*.cf*"`

USER_NAME='s/etsi/vagrant/g'

for i in `find /home/vagrant/dev/$1 -name "*.cf*"`

do

  sed --in-place ${USER_NAME} $i

done

ttcn/AtsMec/AtsMec_ApplicationPackageLifecycleAndOperationGrantingAPI_TestCases.ttcn

+3 −1
Original line number Diff line number Diff line
@@ -549,7 +549,7 @@ module AtsMec_ApplicationPackageLifecycleAndOperationGrantingAPI_TestCases { 
                                                       m_http_message_body_json(

                                                                                m_body_json_create_package_management(

                                                                                                                      m_create_package_management(

                                                                                                                                                  "",

                                                                                                                                                  "appPkgName",

                                                                                                                                                  PX_APP_PKG_VERSION,

                                                                                                                                                  m_checksum(-, PX_CHECKSUM),

                                                                                                                                                  PX_APP_PKG_PATH
@@ -576,6 +576,8 @@ module AtsMec_ApplicationPackageLifecycleAndOperationGrantingAPI_TestCases { 
                            ))))) -> value v_response {

          tc_ac.stop;



          // TODO Chek Location header



          log("*** " & testcasename() & ": PASS: IUT successfully responds with an App Package ***");

          f_selfOrClientSyncAndVerdict(c_tbDone, e_success);

        }

virtualization/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-java16-installer shared/accepted-oracle-license-v1-2 boolean true" | debconf-set-selections -v ) \

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

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

      autoconf \

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

      net-tools \

      ntp \

      oracle-java16-installer \

      oracle-java16-set-default \

      oracle-java17-installer \

      oracle-java17-set-default \

      openssh-server \

      pkg-config \

      python3-dev \

virtualization/vagrant/provisioner.bash

+16 −15
Original line number Diff line number Diff line
@@ -9,11 +9,12 @@ sudo DEBIAN_FRONTEND=noninteractive apt-get dist-upgrade -y 
sudo DEBIAN_FRONTEND=noninteractive apt-get install software-properties-common -y

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

sudo DEBIAN_FRONTEND=noninteractive apt-get update

sudo echo "oracle-java17-installer shared/accepted-oracle-license-v1-3 boolean true" | debconf-set-selections -v

sudo DEBIAN_FRONTEND=noninteractive apt-get --allow-unauthenticated install emacs openjdk-11-jre gcc-8 g++-8 git subversion lsof ntp gdb make cmake flex bison autoconf doxygen graphviz libtool libedit2 libedit-dev libncurses5-dev expect libssl-dev libgcrypt-dev libxml2-dev xutils-dev tcpdump libpcap-dev libwireshark-dev wget tree unzip sshpass kubuntu-desktop valgrind qt5-default qttools5-dev qtmultimedia5-dev libqt5svg5-dev vim tzdata dos2unix xsltproc -y

# Install java

#sudo DEBIAN_FRONTEND=noninteractive apt-get install oracle-java9-installer oracle-java9-set-default -y

#sudo DEBIAN_FRONTEND=noninteractive apt-get --allow-unauthenticated install oracle-java10-installer oracle-java10-set-default -y

#sudo DEBIAN_FRONTEND=noninteractive apt --fix-broken install -y

sudo DEBIAN_FRONTEND=noninteractive apt-get install oracle-java17-installer oracle-java17-set-default -y

# Cleanup

sudo DEBIAN_FRONTEND=noninteractive apt --fix-broken install -y

sudo DEBIAN_FRONTEND=noninteractive apt-get autoremove --purge -y

sudo DEBIAN_FRONTEND=noninteractive apt-get clean
@@ -81,9 +82,7 @@ echo ". ~/devenv.bash" >> /home/vagrant/.bashrc 


# Clone project

cd /home/vagrant/dev

git clone https://forge.etsi.org/gitlab/mec/gs032p3-ttcn-test-suite.git ./TTF_T012_Mec

cd /home/vagrant/dev/TTF_T012_Mec

git clone --recurse-submodules -b v2.2.1-dev --single-branch https://forge.etsi.org/rep/mec/gs032p3-ttcn-test-suite.git TTF_T012_Mec

git clone --recurse-submodules -b v2.2.1-dev --single-branch https://forge.etsi.org/rep/mec/gs032p3-ttcn-test-suite.git ./TTF_T012_Mec

cd /home/vagrant/dev/TTF_T012_Mec/ttcn

git clone https://forge.etsi.org/gitlab/LIBS/LibCommon.git ./LibCommon

git clone -bTTF011 https://forge.etsi.org/gitlab/LIBS/LibIts ./LibIts
@@ -141,22 +140,24 @@ sudo make -C lcov-1.13/ install 
sudo gem install coveralls-lcov



lcov --version

coveralls-lcov -h

#coveralls-lcov -h



# Install eclipse

cd ${HOME}/frameworks

wget --progress=dot:mega 'http://www.mirrorservice.org/sites/download.eclipse.org/eclipseMirror/technology/epp/downloads/release/2021-12/R/eclipse-cpp-2021-12-R-linux-gtk-x86_64.tar.gz' -Oeclipse-cpp-2021-12-R-linux-gtk-x86_64.tar.gz || exit 1

ECLIPSE_URL='http://www.mirrorservice.org/sites/download.eclipse.org/eclipseMirror/technology/epp/downloads/release/2021-12/R/eclipse-cpp-2021-12-R-linux-gtk-x86_64.tar.gz'

TITAN_URL='https://www.eclipse.org/downloads/download.php?file=/titan/TITAN_Designer_and_Executor_plugin-8.1.0.zip'

wget --progress=dot:mega $ECLIPSE_URL -Oeclipse-cpp-2021-12-R-linux-gtk-x86_64.tar.gz || exit 1

tar -zxvf ./eclipse-cpp-2021-12-R-linux-gtk-x86_64.tar.gz || exit 1

ln -sf ${HOME}/frameworks/eclipse/eclipse ${HOME}/bin/eclipse

rm -f ./eclipse-cpp-2021-12-R-linux-gtk-x86_64.tar.gz



if wget --progress=dot:mega 'https://www.eclipse.org/downloads/download.php?file=/titan/TITAN_Designer_and_Executor_plugin-8.1.0.zip' -OTITAN_Designer_and_Executor_plugin.zip; then

  eclipse/eclipse -noSplash -application org.eclipse.equinox.p2.director \

    -destination /home/vagrant/frameworks/eclipse \

    -repository 'jar:file:///home/vagrant/frameworks/TITAN_Designer_and_Executor_plugin.zip!/' \

    -installIU TITAN_Designer.feature.group,TITAN_Executor.feature.group,TITAN_Log_Viewer.feature.group,Titan_external_dependencies.feature.group,Titanium.feature.group,Titanium_external_dependencies.feature.group

  rm -f TITAN_Designer_and_Executor_plugin.zip

fi

#if wget --progress=dot:mega $TITAN_URL -OTITAN_Designer_and_Executor_plugin.zip; then

#  eclipse/eclipse -noSplash -application org.eclipse.equinox.p2.director \

#    -destination /home/vagrant/frameworks/eclipse \

#    -repository 'jar:file:///home/vagrant/frameworks/TITAN_Designer_and_Executor_plugin.zip' \

#    -installIU TITAN_Designer.feature.group,TITAN_Executor.feature.group,TITAN_Log_Viewer.feature.group,Titan_external_dependencies.feature.group,Titanium.feature.group,Titanium_external_dependencies.feature.group

#  rm -f TITAN_Designer_and_Executor_plugin.zip

#fi



# Build Titan

cd /home/vagrant/dev/TTF_T012_Mec/scripts