Commit aec9628b authored by YannGarcia's avatar YannGarcia
Browse files

Finalyze MEC028 v2.2.1 TPs implementations

parent f4b7245e
......@@ -65,6 +65,7 @@ RUN echo "docker-STF-dev" > /etc/hostname \
sshpass \
tcpdump \
texlive-font-utils \
texlive-latex-base \
texlive-latex-extra \
tshark \
tzdata \
......
......@@ -5,6 +5,10 @@
set -e
set -vx
docker rmi --force e96ecd1d6346 9b5cd0f55eee 21cefa32f592
# Force removing stfubuntu docker image
if [ "$1" == "--force-stfubuntu" ]; then
if [ -n `docker images -q stfubuntu` ]; then
......
......@@ -116,4 +116,88 @@ module WlanInformationAPI_Functions {
} // End of function f_delete_assoc_sta_subscription
function f_create_measurement_config(
out MeasurementConfig p_measurement_config
) runs on HttpComponent {
var Headers v_headers;
var HttpMessage v_response;
f_init_default_headers_list(-, -, v_headers);
httpPort.send(
m_http_request(
m_http_request_post(
PICS_ROOT_API & PX_ME_WLAN_URI & "/measurements",
v_headers,
m_http_message_body_json(
m_body_json_wlan_measurement_config(
m_measurement_config(
-,
{
m_sta_identity(
PX_MAC_ID,
PX_SSID,
-,
PX_IP_ADDRESS
)
},
PX_MEASUREMENT_ID,
m_measurement_info(1000, 10)
))))));
tc_ac.start;
alt {
[] httpPort.receive(
mw_http_response(
mw_http_response_201_created(
mw_http_message_body_json(
mw_body_json_wlan_measurement_config(
mw_measurement_config(
?
)))))) -> value v_response {
tc_ac.stop;
p_measurement_config := v_response.response.body.json_body.measurementConfig;
log("f_create_measurement_config: INFO: IUT successfully responds to the subscription: ", p_measurement_config);
}
[] tc_ac.timeout {
log("f_create_measurement_config: INCONC: Expected message not received");
}
} // End of 'alt' statement
} // End of function "f_create_measurement_config
function f_delete_measurement_config(
in MeasurementConfig p_measurement_config
) runs on HttpComponent {
var Headers v_headers;
var charstring v_uri := regexp(
oct2char(unichar2oct(p_measurement_config.links.self_.href)),
"?+(" & PX_ME_WLAN_URI & "?*)",
0
);
log("====> v_uri: ", v_uri);
f_init_default_headers_list(-, -, v_headers);
httpPort.send(
m_http_request(
m_http_request_delete(
PICS_ROOT_API & v_uri,
v_headers
)));
tc_ac.start;
alt {
[] httpPort.receive(
mw_http_response(
mw_http_response_204_no_content
)) {
tc_ac.stop;
}
[] tc_ac.timeout {
log("f_delete_measurement_config: Expected message not received");
}
} // End of 'alt' statement
} // End of function f_delete_measurement_config
} // End of module WlanInformationAPI_Functions
......@@ -15,4 +15,6 @@ module WlanInformationAPI_Pixits {
modulepar JSON.String PX_IP_ADDRESS := "10.10.10.10";
modulepar JSON.String PX_MEASUREMENT_ID := "1";
} // End of module WlanInformationAPI_Pixits
......@@ -228,6 +228,30 @@ module WlanInformationAPI_Templates {
expiryDeadline := p_expiryDeadline
} // End of template mw_sta_data_rate_subscription
template (omit) StaIdentity m_sta_identity(
in JSON.String p_macId,
in template (omit) JSON.String p_ssid := omit,
in template (omit) JSON.String p_aid := omit,
in template (omit) JSON.String p_ipAddress := omit
) := {
macId := p_macId,
ssid := p_ssid,
aid := p_aid,
ipAddress := p_ipAddress
} // End of template m_sta_identity
template (present) StaIdentity mw_sta_identity(
template (present) JSON.String p_macId := ?,
template JSON.String p_ssid := *,
template JSON.String p_aid := *,
template JSON.String p_ipAddress := *
) := {
macId := p_macId,
ssid := p_ssid,
aid := p_aid,
ipAddress := p_ipAddress
} // End of template mw_sta_identity
template (omit) SubscriptionLinkList m_subscription_link_list(
in template (value) LinkTypes p_links,
in template (omit) Subscription p_subscription := omit
......@@ -280,20 +304,76 @@ module WlanInformationAPI_Templates {
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
) := {
template (value) MeasurementConfig_MeasurementConfigLinkList m_measurement_config_link_list(
in JSON.AnyURI p_href,
in JSON.String p_measurementId
) := {
href := p_href,
measurementId := p_measurementId
} // End of template m_measurement_config
} // End of template m_measurement_config_link_list
template (present) MeasurementConfig_MeasurementConfigLinkList mw_measurement_config(
template (present) JSON.AnyURI p_href := ?,
template (present) JSON.String p_measurementId := ?
) := {
template (present) MeasurementConfig_MeasurementConfigLinkList mw_measurement_config_link_list(
template (present) JSON.AnyURI p_href := ?,
template (present) JSON.String p_measurementId := ?
) := {
href := p_href,
measurementId := p_measurementId
} // End of template mw_measurement_config_link_list
template (omit) MeasurementConfig m_measurement_config(
in template (omit) LinkTypes p_links := omit,
in template (value) StaIdentities p_staId,
in JSON.String p_measurementId,
in template (value) MeasurementInfo p_measurementInfo
) := {
links := p_links,
staId := p_staId,
measurementId := p_measurementId,
measurementInfo := p_measurementInfo
} // End of template m_measurement_config
template (present) MeasurementConfig mw_measurement_config(
template LinkTypes p_links := *,
template (present) StaIdentities p_staId := ?,
template (present) JSON.String p_measurementId := ?,
template (present) MeasurementInfo p_measurementInfo := ?
) := {
links := p_links,
staId := p_staId,
measurementId := p_measurementId,
measurementInfo := p_measurementInfo
} // End of template mw_measurement_config
template (omit) MeasurementInfo m_measurement_info(
in template (omit) UInt16 p_measurementDuration := omit,
in template (omit) UInt16 p_randomInterval:= omit,
in template (omit) ChannelLoadConfig p_channelLoadConf := omit,
in template (omit) BeaconRequestConfig p_beaconRequestConf := omit,
in template (omit) StaStatisticsConfig p_staStatisticsConf := omit,
in template (omit) NeighborReportConfig p_neighborReportConf := omit
) := {
measurementDuration := p_measurementDuration,
randomInterval := p_randomInterval,
channelLoadConf := p_channelLoadConf,
beaconRequestConf := p_beaconRequestConf,
staStatisticsConf := p_staStatisticsConf,
neighborReportConf := p_neighborReportConf
} // End of template m_measurement_info
template MeasurementInfo mw_measurement_info(
template UInt16 p_measurementDuration := *,
template UInt16 p_randomInterval:= *,
template ChannelLoadConfig p_channelLoadConf := *,
template BeaconRequestConfig p_beaconRequestConf := *,
template StaStatisticsConfig p_staStatisticsConf := *,
template NeighborReportConfig p_neighborReportConf := *
) := {
measurementDuration := p_measurementDuration,
randomInterval := p_randomInterval,
channelLoadConf := p_channelLoadConf,
beaconRequestConf := p_beaconRequestConf,
staStatisticsConf := p_staStatisticsConf,
neighborReportConf := p_neighborReportConf
} // End of template mw_measurement_info
} // End of module WlanInformationAPI_Templates
......@@ -461,8 +461,8 @@ module WlanInformationAPI_TypesAndValues {
*/
type record MeasurementInfo {
UInt16 measurementDuration optional,
UInt16 randomInterval optional,
ChannelLoadConfig channelLoadConf optional,
UInt16 randomInterval optional,
ChannelLoadConfig channelLoadConf optional,
BeaconRequestConfig beaconRequestConf optional,
StaStatisticsConfig staStatisticsConf optional,
NeighborReportConfig neighborReportConf optional
......
......@@ -138,6 +138,7 @@ module LibItsHttp_JsonMessageBodyTypes {
StaDataRateSubscription staDataRateSubscription,
WlanInformationAPI_TypesAndValues.SubscriptionLinkList subscriptionLinkList_wlan,
MeasurementConfigLinkList measurementConfigLinkList,
MeasurementConfig measurementConfig,
UuUnicastProvisioningInfo uuUnicastProvisioningInfo,
UuMbmsProvisioningInfo uuMbmsProvisioningInfo,
Pc5ProvisioningInfo pc5ProvisioningInfo,
......
......@@ -1076,6 +1076,18 @@ group ams_api {
measurementConfigLinkList := p_measurement_config_link_list
} // End of template mw_body_json_wlan_measurement_config_link_list
template (value) JsonBody m_body_json_wlan_measurement_config(
in template (value) MeasurementConfig p_measurement_config
) := {
measurementConfig := p_measurement_config
} // End of template m_body_json_wlan_measurement_config
template (present) JsonBody mw_body_json_wlan_measurement_config(
template (present) MeasurementConfig p_measurement_config := ?
) := {
measurementConfig := p_measurement_config
} // End of template mw_body_json_wlan_measurement_config
} // 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