Commit b2cef6f1 authored by Ikram Haq's avatar Ikram Haq
Browse files

Merge branch 'TTF_T043_T4_xFlow' into 'TTF_T043' 

Merge request from TTF_T043_T4_xFlow into TTF_T043

See merge request !5
parents d5d414e7 92a179e5

ccsrc/Protocols/Json/json_codec.cc

+13 −0
Original line number Diff line number Diff line
@@ -32,6 +32,10 @@ int json_codec::encode (const LibHttp__JsonMessageBodyTypes::JsonBody& msg, OCTE 
    const TrafficManagementAPI__TypesAndValues::BwInfo& bw_info = msg.bwInfo();

    bw_info.encode(TrafficManagementAPI__TypesAndValues::BwInfo_descr_, encoding_buffer, TTCN_EncDec::CT_JSON);

    data = OCTETSTRING(encoding_buffer.get_len(), encoding_buffer.get_data())/* + char2oct(CHARSTRING("}"))*/;

  } else if (msg.ischosen(LibHttp__JsonMessageBodyTypes::JsonBody::ATL_bwchgeventsubscription)) {

    const TrafficManagementAPI__TypesAndValues::BwChgEventSubscription& bw_chg_event_subscription = msg.bwInfo();

    bw_info.encode(TrafficManagementAPI__TypesAndValues::BwChgEventSubscription_descr_, encoding_buffer, TTCN_EncDec::CT_JSON);

    data = OCTETSTRING(encoding_buffer.get_len(), encoding_buffer.get_data())/* + char2oct(CHARSTRING("}"))*/;

  } else if (msg.ischosen(LibHttp__JsonMessageBodyTypes::JsonBody::ALT_mtsSessionInfo)) {

    const TrafficManagementAPI__TypesAndValues::MtsSessionInfo& mts_session_info = msg.mtsSessionInfo();

    mts_session_info.encode(TrafficManagementAPI__TypesAndValues::MtsSessionInfo_descr_, encoding_buffer, TTCN_EncDec::CT_JSON);
@@ -153,6 +157,15 @@ int json_codec::decode (const OCTETSTRING& p_data, LibHttp__JsonMessageBodyTypes 
      bw_info.decode(TrafficManagementAPI__TypesAndValues::BwInfo_descr_, decoding_buffer_, TTCN_EncDec::CT_JSON);

      msg.bwInfo() = bw_info;

    }

  } else if ((it->second.find("\"_links\"") != std::string::npos) && (it->second.find("subscriptions\"") != std::string::npos)) { // SubscriptionLinkList

    TrafficManagementAPI__TypesAndValues::SubscriptionLinkList subscription_link_list;

    subscription_link_list.decode(TrafficManagementAPI__TypesAndValues::SubscriptionLinkList_descr_, decoding_buffer, TTCN_EncDec::CT_JSON);

    msg.subscriptionLinkList() = subscription_link_list;

  } else if ((it->second.find("\"bwchgeventsubscription\"") != std::string::npos) {

    TrafficManagementAPI__TypesAndValues::BwChgEventSubscription bw_chg_event_subscription;

    TTCN_Buffer decoding_buffer_(OCTETSTRING(str.length(), (const unsigned char*)str.c_str()));

    bw_chg_event_subscription.decode(TrafficManagementAPI__TypesAndValues::MtsCapabilityInfo_descr_, decoding_buffer_, TTCN_EncDec::CT_JSON);

    msg.bwchgeventsubscription() = bw_chg_event_subscription;

  } else if ((it->second.find("\"mtsCapabilityInfo\"") != std::string::npos) || (it->second.find("\"mtsAccessInfo\"") != std::string::npos)) {

    TrafficManagementAPI__TypesAndValues::MtsCapabilityInfo mts_cap_info;

    TTCN_Buffer decoding_buffer_(OCTETSTRING(str.length(), (const unsigned char*)str.c_str()));

etc/AtsMec_TrafficManagement/AtsMec_TrafficManagement.cfg_

0 → 100644
+195 −0
Original line number Diff line number Diff line 
[MODULE_PARAMETERS]

# This section shall contain the values of all parameters that are defined in your TTCN-3 modules.



# IUT roles



LibCommon_Time.PX_TAC := 30.0

#LibCommon_Time.PX_TWAIT := 30.0

LibCommon_Sync.PX_TSYNC_TIME_LIMIT := 30.0;

LibCommon_Sync.PX_TSHUT_DOWN_TIME_LIMIT := 30.0;



LibHttp_Pics.PICS_HEADER_HOST := "192.168.1.39"



LibHttp_Pics.PICS_HEADER_CONTENT_TYPE := "application/json"

LibHttp_Pics.PICS_USE_TOKEN_HEADER    := true

#LibHttp_Pics.PICS_TOKEN_HEADER        := "Basic WrongToken"



# LibMec_Pixits





[LOGGING]

# In this section you can specify the name of the log file and the classes of events

# you want to log into the file or display on console (standard error).



LogFile := "../logs/AtsMec_TrafficManagement/%e.%h-%r.%s"

FileMask := LOG_ALL | USER | DEBUG | MATCHING

ConsoleMask := LOG_ALL | USER | DEBUG | MATCHING

#FileMask := ERROR | WARNING | USER | MATCHING | EXECUTOR_RUNTIME | VERDICTOP | PORTEVENT | TESTCASE

#ConsoleMask := ERROR | WARNING | USER | MATCHING | EXECUTOR_RUNTIME | VERDICTOP | PORTEVENT | TESTCASE

LogSourceInfo := Stack

LogEntityName:= Yes

LogEventTypes:= Yes

#TimeStampFormat := DateTime



[TESTPORT_PARAMETERS]

# In this section you can specify parameters that are passed to Test Ports.

system.httpPort.params := "HTTP(codecs=json:json_codec)/TCP(debug=1,server=192.168.1.12,port=30030,use_ssl=0)"

#system.httpPort.params := "HTTP(codecs=json:json_codec)/TCP(debug=1,server=try-mec.etsi.org,port=443,use_ssl=1)"

system.httpPort_notif.params := "HTTP(codecs=json:json_codec)/TCP(debug=1,server_mode=1,local_port=80,use_ssl=0)"



[DEFINE]

# In this section you can create macro definitions,

# that can be used in other configuration file sections except [INCLUDE] and [ORDERED_INCLUDE].



[INCLUDE]

# To use configuration settings given in other configuration files,

# the configuration files just need to be listed in this section, with their full or relative pathnames.



[ORDERED_INCLUDE]

# To use configuration settings given in other configuration files,

# the configuration files just need to be listed in this section, with their full or relative pathnames.



[EXTERNAL_COMMANDS]

# This section can define external commands (shell scripts) to be executed by the ETS

# whenever a control part or test case is started or terminated.



#BeginTestCase := ""

#EndTestCase := ""

#BeginControlPart := ""

#EndControlPart := ""



[EXECUTE]

# In this section you can specify what parts of your test suite you want to execute.

#AtsMec_TestControl.control



# Check that the IUT responds with the list of configured bandwidth allocations when queried by a MEC Application - none

#AtsMec_TrafficManagementAPI_TestCases.TC_MEC_MEC015_SRV_TM_001_OK_01

# Check that the IUT responds with a configured bandwidth allocation when queried by a MEC Application - app_instance_id

#AtsMec_TrafficManagementAPI_TestCases.TC_MEC_MEC015_SRV_TM_001_OK_02

# Check that the IUT responds with a configured bandwidth allocation when queried by a MEC Application - app_name

#AtsMec_TrafficManagementAPI_TestCases.TC_MEC_MEC015_SRV_TM_001_OK_03

# Check that the IUT responds with a configured bandwidth allocation when queried by a MEC Application - session_id

#AtsMec_TrafficManagementAPI_TestCases.TC_MEC_MEC015_SRV_TM_001_OK_04

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

#AtsMec_TrafficManagementAPI_TestCases.TC_MEC_MEC015_SRV_TM_001_BR

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

#AtsMec_TrafficManagementAPI_TestCases.TC_MEC_MEC015_SRV_TM_001_NF_01

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

#AtsMec_TrafficManagementAPI_TestCases.TC_MEC_MEC015_SRV_TM_001_NF_02

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

#AtsMec_TrafficManagementAPI_TestCases.TC_MEC_MEC015_SRV_TM_001_NF_03

# Check that the IUT acknowledges a creation of a bandwidthAllocation resource

#AtsMec_TrafficManagementAPI_TestCases.TC_MEC_MEC015_SRV_TM_002_OK

# Check that the IUT responds with an error when a request with incorrect parameters is sent by a MEC Application - sessionFilter shall be omitted

#AtsMec_TrafficManagementAPI_TestCases.TC_MEC_MEC015_SRV_TM_002_BR_01

# Check that the IUT responds with an error when a request with incorrect parameters is sent by a MEC Application - sessionFilter shall be present

#AtsMec_TrafficManagementAPI_TestCases.TC_MEC_MEC015_SRV_TM_002_BR_02

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

#AtsMec_TrafficManagementAPI_TestCases.TC_MEC_MEC015_SRV_TM_003_OK

#Check that the IUT updates the requested bandwidth requirements when commanded by a MEC Application

#AtsMec_TrafficManagementAPI_TestCases.TC_MEC_MEC015_SRV_TM_004_OK

# Check that the IUT responds with an error when a request with incorrect parameters is sent by a MEC Application - sessionFilter shall be omitted

#AtsMec_TrafficManagementAPI_TestCases.TC_MEC_MEC015_SRV_TM_004_BR_01

#Check that the IUT responds with an error when a request with incorrect parameters is sent by a MEC Application - sessionFilter shall be present

#AtsMec_TrafficManagementAPI_TestCases.TC_MEC_MEC015_SRV_TM_004_BR_01

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

#AtsMec_TrafficManagementAPI_TestCases.TC_MEC_MEC015_SRV_TM_004_BR_02

#Check that the IUT when provided with just the changes (deltas) updates the requested bandwidth requirements when commanded by a MEC Application

#TC_MEC_MEC015_SRV_TM_005_OK

#Check that the IUT responds with an error when a request with incorrect parameters is sent by a MEC Application - sessionFilter shall be omitted

#AtsMec_TrafficManagementAPI_TestCases.TC_MEC_MEC015_SRV_TM_005_BR_01

#Check that the IUT responds with an error when a request with incorrect parameters is sent by a MEC Application - sessionFilter shall be present

#AtsMec_TrafficManagementAPI_TestCases.TC_MEC_MEC015_SRV_TM_005_BR_02

#Check that the IUT when provided with just the changes (deltas) updates the requested bandwidth requirements when commanded by a MEC Application

#TC_MEC_MEC015_SRV_TM_005_NF

#Check that the IUT unregisters from the Bandwidth Management Service when commanded by a MEC Application

#AtsMec_TrafficManagementAPI_TestCases.TC_MEC_MEC015_SRV_TM_006_OK

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

#AtsMec_TrafficManagementAPI_TestCases.TC_MEC_MEC015_SRV_TM_006_NF



// Multi-access Traffic Steering information Test Cases

#Check that the IUT responds with the Multi-access Traffic Steering information when queried by a MEC Application

#AtsMec_MultiAccessSteeringInfoAPI_TestCases.TC_MEC_MEC015_SRV_MTS_001_OK

#Check that the IUT responds with the list of configured Multi-access Traffic Steering when queried by a MEC Application - none

#AtsMec_MultiAccessSteeringInfoAPI_TestCases.TC_MEC_MEC015_SRV_MTS_002_OK_01

#Check that the IUT responds with the list of configured Multi-access Traffic Steering when queried by a MEC Application - app_instance_id

#AtsMec_MultiAccessSteeringInfoAPI_TestCases.TC_MEC_MEC015_SRV_MTS_002_OK_02

#Check that the IUT responds with the list of configured Multi-access Traffic Steering when queried by a MEC Application - app_name

#AtsMec_MultiAccessSteeringInfoAPI_TestCases.TC_MEC_MEC015_SRV_MTS_002_OK_03

#Check that the IUT responds with the list of configured Multi-access Traffic Steering when queried by a MEC Application - sessionId

#AtsMec_MultiAccessSteeringInfoAPI_TestCases.TC_MEC_MEC015_SRV_MTS_002_OK_04

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

#AtsMec_MultiAccessSteeringInfoAPI_TestCases.TC_MEC_MEC015_SRV_MTS_002_BR

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

#AtsMec_MultiAccessSteeringInfoAPI_TestCases.TC_MEC_MEC015_SRV_MTS_002_NF

#Check that the IUT creates a MTS session when queried by a MEC Application

#AtsMec_MultiAccessSteeringInfoAPI_TestCases.TC_MEC_MEC015_SRV_MTS_003_OK_01

#Check that the IUT creates a MTS session when queried by a MEC Application

#AtsMec_MultiAccessSteeringInfoAPI_TestCases.TC_MEC_MEC015_SRV_MTS_003_OK_02

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

#AtsMec_MultiAccessSteeringInfoAPI_TestCases.TC_MEC_MEC015_SRV_MTS_003_BR

#Check that the IUT responds with a configured Multi-access Traffic Steering session when queried by a MEC Application

#AtsMec_MultiAccessSteeringInfoAPI_TestCases.TC_MEC_MEC015_SRV_MTS_004_OK

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

#AtsMec_MultiAccessSteeringInfoAPI_TestCases.TC_MEC_MEC015_SRV_MTS_004_BR

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

#AtsMec_MultiAccessSteeringInfoAPI_TestCases.TC_MEC_MEC015_SRV_MTS_004_NF

#Check that the IUT updates the information about an individual MTS session when commanded by a MEC Application

#AtsMec_MultiAccessSteeringInfoAPI_TestCases.TC_MEC_MEC015_SRV_MTS_005_OK

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

#AtsMec_MultiAccessSteeringInfoAPI_TestCases.TC_MEC_MEC015_SRV_MTS_005_BR

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

#AtsMec_MultiAccessSteeringInfoAPI_TestCases.TC_MEC_MEC015_SRV_MTS_005_NF

#Check that the IUT deregisters a MTS session when commanded by a MEC Application

#AtsMec_MultiAccessSteeringInfoAPI_TestCases.TC_MEC_MEC015_SRV_MTS_006_OK

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

#AtsMec_MultiAccessSteeringInfoAPI_TestCases.TC_MEC_MEC015_SRV_MTS_006_NF



// BWM change event susbsciption Testcases

#Check that the IUT responds with a list of BWM change event susbsciption when queried by a MEC Application

#AtsMec_BandwidthChangeEventSubAPI_TestCases.TC_MEC_MEC015_SRV_BWMSUBLOOKUP_001_OK

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

#AtsMec_BandwidthChangeEventSubAPI_TestCases.TC_MEC_MEC015_SRV_BWSUBLOOKUP_001_BR

#Check that the IUT responds with an error when no subscription are created

#AtsMec_BandwidthChangeEventSubAPI_TestCases.TC_MEC_MEC015_SRV_BWSUBLOOKUP_001_NF

#Check that the IUT responds with a list of subscriptions for notifications on services availability when queried by a MEC Application - Filter on subscription_type

#AtsMec_BandwidthChangeEventSubAPI_TestCases.TC_MEC_MEC015_SRV_BWSUBLOOKUP_002_OK

#Check that the IUT responds with with an error when no subscription matches with the filter - Filter on subscription_type

#AtsMec_BandwidthChangeEventSubAPI_TestCases.TP_MEC_MEC015_SRV_BWSUBLOOKUP_002_NF

#Check that the IUT responds with a individual BWM change event susbsciption when queried by a MEC Application

#AtsMec_BandwidthChangeEventSubAPI_TestCases.TC_MEC_MEC015_SRV_BWSUBLOOKUP_003_OK

#Check that the IUT responds with a individual BWM change event susbsciption when queried by a MEC Application

#AtsMec_BandwidthChangeEventSubAPI_TestCases.TC_MEC_MEC015_SRV_BWSUBLOOKUP_003_NF

#Check that the IUT acknowledges the creation of BWM change event subscription request when commanded by a MEC Application

#AtsMec_BandwidthChangeEventSubAPI_TestCases.TC_MEC_MEC015_SRV_BW_SUB_NOT_001_OK

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

#AtsMec_BandwidthChangeEventSubAPI_TestCases.TC_MEC_MEC015_SRV_BW_SUB_NOT_001_BR_01

#Check that the IUT responds with an error when a request with incorrect parameters is sent by a MEC Application - Neither callbackReference nor websockNotifConfig provided

#AtsMec_BandwidthChangeEventSubAPI_TestCases.TC_MEC_MEC015_SRV_BW_SUB_NOT_001_BR_02

#Check that the IUT responds with an error when a request with incorrect parameters is sent by a MEC Application - Both callbackReference and websockNotifConfig provided

#AtsMec_BandwidthChangeEventSubAPI_TestCases.TC_MEC_MEC015_SRV_BW_SUB_NOT_001_BR_03

#Check that the IUT acknowledges the update of BWM change event subscription request when commanded by a MEC Application

#AtsMec_BandwidthChangeEventSubAPI_TestCases.TC_MEC_MEC015_SRV_BW_SUB_NOT_002_OK

#Check that the IUT acknowledges an error when a request for an URI that cannot be mapped to a valid resource URI is sent by a MEC Application

#AtsMec_BandwidthChangeEventSubAPI_TestCases.TC_MEC_MEC015_SRV_BW_SUB_NOT_002_NF

#Check that the IUT acknowledges the cancellation of BWM change event subscription request when commanded by a MEC Applications

#AtsMec_BandwidthChangeEventSubAPI_TestCases.TC_MEC_MEC015_SRV_BW_SUB_NOT_003_OK

#Check that the IUT responds with an error when a request for an URI that cannot be mapped to a valid resource URI is sent by a MEC Application

#AtsMec_BandwidthChangeEventSubAPI_TestCases.TC_MEC_MEC015_SRV_BW_SUB_NOT_003_NF

#Check that the BWM service sends a notification about a bandwidth utility or the data volume if the BWM service has an associated subscription and the event is generated

#AtsMec_BandwidthChangeEventSubAPI_TestCases.TC_MEC_MEC015_SRV_BW_SUB_NOT_004_OK





[GROUPS]

# In this section you can specify groups of hosts. These groups can be used inside the

# [COMPONENTS] section to restrict the creation of certain PTCs to a given set of hosts.



[COMPONENTS]

# This section consists of rules restricting the location of created PTCs.



[MAIN_CONTROLLER]

# The options herein control the behavior of MC.

KillTimer := 10.0

LocalAddress := 127.0.0.1

TCPPort := 12000

NumHCs := 1

ttcn/AtsMec_ApplicationPackageLifecycleAndOperationGranting/AtsMec_ApplicationPackageLifecycleAndOperationGrantingAPI_TestCases.ttcn

+37 −34

File changed.

Preview size limit exceeded, changes collapsed.

ttcn/AtsMec_DeviceApplicationInterface/AtsMec_DeviceApplicationInterfaceAPI_TestCases.ttcn

+17 −17

File changed.

Preview size limit exceeded, changes collapsed.

ttcn/AtsMec_TrafficManagement/AtsMec_BandwidthChangeEventSubAPI_TestCases.ttcn

0 → 100644
+1036 −0

File added.

Preview size limit exceeded, changes collapsed.