Skip to content
GitLab
Commit ce699525 authored by YannGarcia's avatar YannGarcia
Browse files

Update Docker support

parent 6e504185
Expand all Hide whitespace changes
Inline Side-by-side
.jenkins.sh
View file @ ce699525
......@@ -2,18 +2,14 @@
# Copyright ETSI 2018
# See: https://forge.etsi.org/etsi-forge-copyright-statement.txt
#set -vx
set -vx
#set -e
cd "$(dirname "$0")"
cd $(dirname $0)
cd ./docker
run_dir="$(pwd)"
run_dir=`pwd`
# Docker version 2
cd docker
./build.sh
#./run.sh
cd -
exit 0
ccsrc/Protocols/Http/http_codec.cc
View file @ ce699525
......@@ -57,6 +57,9 @@ int http_codec::decode (const OCTETSTRING& data, LibItsHttp__TypesAndValues::Htt
return -1;
}
loggers::get_instance().log_msg("http_codec::decode: message_id: ", message_id);
if (message_id.lengthof() < 6) { // HTTP/
return -1;
}
// Extract parameters
try {
std::string str(static_cast<const char*>(message_id));
......
docker/Dockerfile.stfubuntu
View file @ ce699525
......@@ -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-java15-installer shared/accepted-oracle-license-v1-2 boolean true" | debconf-set-selections -v ) \
&& ( echo "oracle-java16-installer shared/accepted-oracle-license-v1-2 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-java15-installer \
oracle-java15-set-default \
oracle-java16-installer \
oracle-java16-set-default \
openssh-server \
pkg-config \
python3-dev \
......
docker/home/etc/init.d/20-eclipse.sh
View file @ ce699525
#!/bin/bash
ECLIPSE_URL='https://www.eclipse.org/downloads/download.php?file=/technology/epp/downloads/release/2020-06/R/eclipse-jee-2020-06-R-linux-gtk-x86_64.tar.gz&r=1'
TITAN_URL='https://www.eclipse.org/downloads/download.php?file=/titan/TITAN_Designer_and_Executor_Plugin_7.1.0.zip&r=1'
#set -e
set -vx
echo -e "*****************************\n* Install eclipse\n*****************************\n"
mkdir -p ${HOME}/frameworks
cd ${HOME}/frameworks || exit 1
wget --progress=dot:mega 'https://www.eclipse.org/downloads/download.php?file=/technology/epp/downloads/release/helios/SR2/eclipse-cpp-helios-SR2-linux-gtk-x86_64.tar.gz' -Oeclipse-cpp-helios-SR2-linux-gtk-x86_64.tar.gz || exit 1
tar -zxvf ./eclipse-cpp-helios-SR2-linux-gtk-x86_64.tar.gz || exit 1
wget --progress=dot:mega 'http://www.mirrorservice.org/sites/download.eclipse.org/eclipseMirror/technology/epp/downloads/release/2020-06/R/eclipse-cpp-2020-06-R-linux-gtk-x86_64.tar.gz' -Oeclipse-cpp-2020-06-R-linux-gtk-x86_64.tar.gz || exit 1
tar -zxvf ./eclipse-cpp-2020-06-R-linux-gtk-x86_64.tar.gz || exit 1
ln -sf ${HOME}/frameworks/eclipse/eclipse ${HOME}/bin/eclipse
rm -f ./eclipse-cpp-helios-SR2-linux-gtk-x86_64.tar.gz
rm -f ./eclipse-cpp-2020-06-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-6.4.pl0.zip&r=1' -OTITAN_Designer_and_Executor_plugin.zip; then
if wget --progress=dot:mega 'https://mirrors.dotsrc.org/eclipse//titan/TITAN_Designer_and_Executor_Plugin_7.1.0.zip' -OTITAN_Designer_and_Executor_plugin.zip; then
eclipse/eclipse -noSplash -application org.eclipse.equinox.p2.director \
-destination ${HOME}/frameworks/eclipse \
-repository jar:file://${HOME}/frameworks/TITAN_Designer_and_Executor_plugin.zip!/ \
-destination /home/etsi/frameworks/eclipse \
-repository 'jar:file:///home/etsi/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
......
docker/home/etc/init.d/40-ttf_t012.sh
View file @ ce699525
......@@ -6,7 +6,7 @@ set -vx
echo -e "*****************************\n* Checkout TTF T012 sources\n*****************************\n"
mkdir -p ${HOME}/dev && cd ${HOME}/dev || exit 1
git clone --recurse-submodules -b ttf_t012 --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/etsi/dev/TTF_T012_Mec/ttcn
git clone https://forge.etsi.org/gitlab/LIBS/LibCommon.git ./LibCommon
git clone -bTTF0002 https://forge.etsi.org/gitlab/LIBS/LibIts ./LibIts
......
docker/home/etc/init.d/50-doxygen.sh 0 → 100755
View file @ ce699525
#!/bin/bash
#set -e
set -vx
echo -e "*****************************\n* Build docs \n*****************************\n"
. /home/etsi/devenv.bash
cd ${HOME}/dev/TTF_T012_Mec/docs || exit 1
doxygen ./o2.cfg || exit 1
cd ${HOME}
exit 0
docs/o2.cfg
View file @ ce699525
This diff is collapsed.
etc/AtsMec/AtsMec_Mockoon.cf_
View file @ ce699525
......@@ -14,7 +14,7 @@ LibItsHttp_Pics.PICS_HEADER_CONTENT_TYPE := "application/json"
LibItsHttp_Pics.PICS_USE_TOKEN_HEADER := true
#LibItsHttp_Pics.PICS_TOKEN_HEADER := "Basic WrongToken"
LibMec_Pics.PICS_ROOT_API := "/sbxcyccf53" # Need to sign in on https://try-mec.etsi.org/, section 'Try-it from your MEC application'
LibMec_Pics.PICS_ROOT_API := "/sbxj2byamx" # Need to sign in on https://try-mec.etsi.org/, section 'Try-it from your MEC application'
# LibMec_Pixits
LibMec_Pixits.PX_ME_APP_Q_ZONE_ID_URI := "/location/v2/queries/zones"
......@@ -306,7 +306,7 @@ system.httpPort_notif.params := "HTTP(codecs=json:json_codec)/TCP(debug=1,server
# Check that the IUT responds with an error when a request with incorrect parameters is sent by a MEC Application
#AtsMec_WlanInformationAPI_TestCases.TC_MEC_MEC028_SRV_WAI_004_BR
# Check that the IUT responds with the requested list of subscription
#AtsMec_WlanInformationAPI_TestCases.TC_MEC_MEC028_SRV_WAI_005_OK
AtsMec_WlanInformationAPI_TestCases.TC_MEC_MEC028_SRV_WAI_005_OK
# Check that the IUT responds with the requested list of subscription
#AtsMec_WlanInformationAPI_TestCases.TC_MEC_MEC028_SRV_WAI_006_OK
# Check that the IUT responds with an error when a request with incorrect parameters is sent by a MEC Application
......@@ -332,7 +332,7 @@ system.httpPort_notif.params := "HTTP(codecs=json:json_codec)/TCP(debug=1,server
# Check that the IUT responds with an error when an not existing subscription cannot be deleted
#AtsMec_WlanInformationAPI_TestCases.TC_MEC_MEC028_SRV_WAI_010_NF
# Check that the IUT sends a notification about WLAN event notification if the MEC service has an associated subscription and the event is generated
AtsMec_WlanInformationAPI_TestCases.TC_MEC_MEC028_SRV_WAI_011_OK
#AtsMec_WlanInformationAPI_TestCases.TC_MEC_MEC028_SRV_WAI_011_OK
# ETSI GS MEC 030
# Check that the IUT responds with a configured provisioning information over Uu unicast when queried by a MEC Application
......@@ -422,8 +422,6 @@ AtsMec_WlanInformationAPI_TestCases.TC_MEC_MEC028_SRV_WAI_011_OK
#AtsMec_V2XInformationServiceAPI_TestCases.TC_MEC_MEC030_SRV_V2X_010_OK_04
# Check that the IUT responds with an error when a request with incorrect parameters is sent by a MEC Application
#AtsMec_V2XInformationServiceAPI_TestCases.TC_MEC_MEC030_SRV_V2X_010_NF
# Check that the IUT sends a notification about WLAN event notification if the MEC service has an associated subscription and the event is generated
AtsMec_V2XInformationServiceAPI_TestCases.TC_MEC_MEC028_SRV_WAI_011_OK
[GROUPS]
# In this section you can specify groups of hosts. These groups can be used inside the
......
logs/README.md 0 → 100644
View file @ ce699525
This folder will contains execution logs for ETSI MEC-DECODE ATS.
ttcn/LibMec/WlanInformationAPI/ttcn/WlanInformationAPI_Functions.ttcn
View file @ ce699525
......@@ -67,6 +67,7 @@ module WlanInformationAPI_Functions {
mw_assoc_sta_subscription(
PX_ASSOC_STA_SUBSCRIPTION_CALLBACK,
-,
-, -,
?
)))))) -> value v_response {
tc_ac.stop;
......
ttcn/LibMec/WlanInformationAPI/ttcn/WlanInformationAPI_Templates.ttcn
View file @ ce699525
......@@ -264,4 +264,36 @@ module WlanInformationAPI_Templates {
ipAddress := p_ipAddress
} // End of template mw_ap_identity
template (omit) MeasurementConfigLinkList m_measurement_config_list(
in template (omit) LinkTypes p_links := omit,
in template (value) MeasurementConfig_MeasurementConfigLinkList p_measurementConfig
) := {
links := p_links,
measurementConfig := p_measurementConfig
} // End of template m_measurement_config_list
template (present) MeasurementConfigLinkList mw_measurement_config_list(
template LinkTypes p_links := *,
template (present) MeasurementConfig_MeasurementConfigLinkList p_measurementConfig := ?
) := {
links := p_links,
measurementConfig := p_measurementConfig
} // End of template mw_measurement_config_list
template (value) MeasurementConfig_MeasurementConfigLinkList m_measurement_config(
in JSON.AnyURI p_href,
in JSON.String p_measurementId
) := {
href := p_href,
measurementId := p_measurementId
} // End of template m_measurement_config
template (present) MeasurementConfig_MeasurementConfigLinkList mw_measurement_config(
template (present) JSON.AnyURI p_href := ?,
template (present) JSON.String p_measurementId := ?
) := {
href := p_href,
measurementId := p_measurementId
} // End of template mw_measurement_config
} // End of module WlanInformationAPI_Templates
ttcn/LibMec/WlanInformationAPI/ttcn/WlanInformationAPI_TypesAndValues.ttcn
View file @ ce699525
......@@ -769,7 +769,7 @@ module WlanInformationAPI_TypesAndValues {
* @desc Set for trigger-based event notification reporting
* @member trigger_ Trigger for the notification
* @member threshold Number of connected stations threshold for trigger-based event reporting
* @see ETSI GS MEC 028 Clause 6.3.2 Type: AssocStaSubscription
* @see ETSI GS MEC 028 Clause 6.3.3 Type: StaDataRateSubscription
*/
type record NotificationEvent {
UInt8 trigger_,
......
ttcn/LibMec/ttcn/LibMec_Pixits.ttcn
View file @ ce699525
......@@ -30,9 +30,9 @@ module LibMec_Pixits {
modulepar charstring PX_ME_MTS_SESSIONS_URI := "/mts/v1/mts_sessions";
modulepar charstring PX_ME_WLAN_QUERIES_URI := "/wai/v1/queries";
modulepar charstring PX_ME_WLAN_QUERIES_URI := "/wai/v2/queries";
modulepar charstring PX_ME_WLAN_URI := "/wai/v1";
modulepar charstring PX_ME_WLAN_URI := "/wai/v2";
modulepar charstring PX_ME_V2X_URI := "/vis/v1";
......
ttcn/patch_lib_http/LibItsHttp_JsonMessageBodyTypes.ttcn
View file @ ce699525
......@@ -137,6 +137,7 @@ module LibItsHttp_JsonMessageBodyTypes {
AssocStaSubscription assocStaSubscription,
StaDataRateSubscription staDataRateSubscription,
WlanInformationAPI_TypesAndValues.SubscriptionLinkList subscriptionLinkList_wlan,
MeasurementConfigLinkList measurementConfigLinkList,
UuUnicastProvisioningInfo uuUnicastProvisioningInfo,
UuMbmsProvisioningInfo uuMbmsProvisioningInfo,
Pc5ProvisioningInfo pc5ProvisioningInfo,
......
ttcn/patch_lib_http/LibItsHttp_JsonTemplates.ttcn
View file @ ce699525
......@@ -1064,6 +1064,18 @@ group ams_api {
subscriptionLinkList_wlan := p_subscription_link_list
} // End of template mw_body_json_wlan_subscription_link_list
template (value) JsonBody m_body_json_wlan_measurement_config_link_list(
in template (value) MeasurementConfigLinkList p_measurement_config_link_list
) := {
measurementConfigLinkList := p_measurement_config_link_list
} // End of template m_body_json_wlan_measurement_config_link_list
template (present) JsonBody mw_body_json_wlan_measurement_config_link_list(
template (present) MeasurementConfigLinkList p_measurement_config_link_list := ?
) := {
measurementConfigLinkList := p_measurement_config_link_list
} // End of template mw_body_json_wlan_measurement_config_link_list
} // End of group wlan_information
group v2x_information_service {
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment