Commit 64d90b2f authored by YannGarcia's avatar YannGarcia
Browse files

Create virtualization folder; Create EdgePlatformApplicationEnablementAPI for... 

 Create virtualization folder; Create EdgePlatformApplicationEnablementAPI for MEC-10-2 v2.2.1; Remove useless folders
parent e3a8892a

.jenkins.sh

+1 −1
Original line number Diff line number Diff line
@@ -10,6 +10,6 @@ cd $(dirname $0) 
run_dir=`pwd`



# Docker version 2

cd docker

cd virtualization/docker

./build.sh #--force-stfubuntu

#./run.sh

ccsrc/Protocols/Http/http_codec.cc

+2 −0
Original line number Diff line number Diff line
@@ -560,6 +560,8 @@ int http_codec::decode_body(TTCN_Buffer& decoding_buffer, LibItsHttp__MessageBod 
          loggers::get_instance().warning("http_codec::decode_body: Missing data and chunked mode");

          _params->insert(std::pair<std::string, std::string>("missing_data", "1"));

          _params->log();

          OCTETSTRING raw_trunk(len, idx + static_cast<const unsigned char*>(body));

          loggers::get_instance().log_msg("http_codec::decode_body: raw_trunk: ", raw_trunk);

          return -1;

        }

        while (counter < body.lengthof() && ((body[counter].get_octet() == '\r') || (body[counter].get_octet() == '\n'))) { // Skip additional \n

ccsrc/Protocols/Http/http_layer.cc

+5 −3
Original line number Diff line number Diff line
@@ -83,10 +83,11 @@ void http_layer::send_data(OCTETSTRING& data, params& params) { 
void http_layer::receive_data(OCTETSTRING& data, params& params)

{

  loggers::get_instance().log_msg(">>> http_layer::receive_data: ", data);

  loggers::get_instance().log_msg(">>> http_layer::receive_data: _stream_buffer= ", _stream_buffer);



  // Decode HTTP message

  LibItsHttp__TypesAndValues::HttpMessage http_message;

  if (!_stream_buffer.is_bound()) {

  if (!_stream_buffer.is_bound() || (_stream_buffer.lengthof() == 0)) {

    if (data.lengthof() < 6) { // 'HTTP/' or 'GET /'

      loggers::get_instance().warning("http_layer::receive_data: Inconsistant buffer length");

      return;
@@ -95,7 +96,8 @@ void http_layer::receive_data(OCTETSTRING& data, params& params) 
      loggers::get_instance().warning("http_layer::receive_data (0): Failed to decode data");

      return;

    }

  } else {

  } else { // First chunk is received

    loggers::get_instance().warning("http_layer::receive_data: #######################################");

    _stream_buffer += data;

    if (_codec.decode(_stream_buffer, http_message, &params) == -1) {

      loggers::get_instance().warning("http_layer::receive_data (1): Failed to decode data");
@@ -103,7 +105,7 @@ void http_layer::receive_data(OCTETSTRING& data, params& params) 
    }

  }

  params::const_iterator it = params.find("missing_data");

  if (it != params.cend()) {

  if (it != params.cend()) { // Transport layer didn't reassemble chunks, keep current state and wait for the next chunk

    // Store data and wait for the next stream

    loggers::get_instance().warning("http_layer::receive_data: Missing data, save current stream");

    _stream_buffer += data;

etc/AtsMec/AtsMec_Sandbox.cf_

+8 −8
Original line number Diff line number Diff line
@@ -14,16 +14,16 @@ 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                := "/sbx1y8q0x9/mep1" # Need to sign in on https://try-mec.etsi.org/, section 'Try-it from your MEC application'

LibMec_Pics.PICS_ROOT_API                := "/sbxdflb1km/mep1" # Need to sign in on https://try-mec.etsi.org/, section 'Try-it from your MEC application'



# LibMec_Pixits

LibMec_Pixits.PX_RNIS_SUBSCRITIONS_URI    := "/rni/v2/subscriptions"

LibMec_Pixits.PX_RNIS_QUERIES_URI         := "/rni/v2/queries"

LibMec_Pixits.PX_MEC_SVC_MGMT_APPS_URI    := "/mec_service_mgmt/v2/applications"

LibMec_Pixits.PX_ME_APP_SUPPORT_URI       := "/mec_app_support/v2/applications"

LibMec_Pixits.PX_SVC_MGMT_TRANS_URI       := "/mec_service_mgmt/v2/transports"

LibMec_Pixits.PX_ME_APP_SUPPORT_TIMING_CAPS_URI := "/mec_app_support/v2/timing/timing_caps"

LibMec_Pixits.PX_ME_APP_SUPPORT_TIMING_CURRENT_URI := "/mec_app_support/v2/timing/current_time"

LibMec_Pixits.PX_MEC_SVC_MGMT_APPS_URI    := "/mec_service_mgmt/v1/applications"

LibMec_Pixits.PX_ME_APP_SUPPORT_URI       := "/mec_app_support/v1/applications"

LibMec_Pixits.PX_SVC_MGMT_TRANS_URI       := "/mec_service_mgmt/v1/transports"

LibMec_Pixits.PX_ME_APP_SUPPORT_TIMING_CAPS_URI := "/mec_app_support/v1/timing/timing_caps"

LibMec_Pixits.PX_ME_APP_SUPPORT_TIMING_CURRENT_URI := "/mec_app_support/v1/timing/current_time"



LibMec_Pics.PICS_MEC_PLAT := true
@@ -134,7 +134,7 @@ system.httpPort_notif.params := "HTTP(codecs=json:json_codec)/TCP(debug=1,server 


# ETSI GS MEC 011

# Check that the IUT responds with a list of available MEC services for a given application instance when queried by a MEC Application

#AtsMec_EdgePlatformApplicationEnablementAPI_TestCases.TC_MEC_MEC011_SRV_APPSAQ_001_OK

AtsMec_EdgePlatformApplicationEnablementAPI_TestCases.TC_MEC_MEC011_SRV_APPSAQ_001_OK

# Check that the IUT responds with an error when a request with incorrect parameters is sent by a MEC Application

#AtsMec_EdgePlatformApplicationEnablementAPI_TestCases.TC_MEC_MEC011_SRV_APPSAQ_001_BR

# Check that the IUT notifies the authorised relevant (subscribed) application instances when a new service for a given application instance is registered
@@ -150,7 +150,7 @@ system.httpPort_notif.params := "HTTP(codecs=json:json_codec)/TCP(debug=1,server 
# Check that the IUT updates a service information for a given application instance when commanded by a MEC Application

#AtsMec_EdgePlatformApplicationEnablementAPI_TestCases.TC_MEC_MEC011_SRV_APPSAQ_004_OK

# Check that the IUT responds with an error when a request with incorrect parameters is sent by a MEC Application

AtsMec_EdgePlatformApplicationEnablementAPI_TestCases.TC_MEC_MEC011_SRV_APPSAQ_004_BR

#AtsMec_EdgePlatformApplicationEnablementAPI_TestCases.TC_MEC_MEC011_SRV_APPSAQ_004_BR

# Check that the IUT responds with an error when a request for an unknown URI is sent by a MEC Application

#AtsMec_EdgePlatformApplicationEnablementAPI_TestCases.TC_MEC_MEC011_SRV_APPSAQ_004_NF

# Check that the IUT responds with an error when a request sent by a MEC Application doesn't comply with a required condition

ttcn/AtsMec/AtsMec_AppLCM_TestCases.ttcn→ttcn/AtsMec/AtsMec_AppLifecycleManagement_TestCases.ttcn

+26 −26
Original line number Diff line number Diff line
@@ -9,7 +9,7 @@ 
*                 All rights reserved.

*    @see      ETSI GS MEC 003, Draft ETSI GS MEC 010-2 V2.1.1

*/

module AtsMec_AppLCM_TestCases {

module AtsMec_AppLifecycleManagement_TestCases {



  // Libcommon

  import from LibCommon_Sync all;
@@ -21,10 +21,10 @@ module AtsMec_AppLCM_TestCases { 
  import from LibItsHttp_JsonTemplates all;

  import from LibItsHttp_TestSystem all;





    import from AppLCM_Templates all;

    import from AppLCM_Pics all;

    import from AppLCM_Pixits all;

  // LibMec_ApplicationPackageLifecycleAndOperationGrantingAPI

  import from ApplicationPackageLifecycleAndOperationGrantingAPI_Templates all;

  import from ApplicationPackageLifecycleAndOperationGrantingAPI_Pics all;

  import from ApplicationPackageLifecycleAndOperationGrantingAPI_Pixits all;



  // LibMec

  import from LibMec_Functions all;