Commit 439a8f57 authored by Elian Kraja's avatar Elian Kraja
Browse files

Update MEC011 TPs

parent d4ed8cc2
Loading
Loading
Loading
Loading
+8 −11
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ Package MEC_MEC011_SRV_APPSAQ {
         for a given application instance when queried by a MEC Application"

      Reference "ETSI GS MEC 011 2.2.1, clause 8.2.6.3.1",
         "https://forge.etsi.org/gitlab/mec/gs011-app-enablement-api/blob/master/Mp1.yaml#/definitions/ServiceInfo" //Outdated
         "https://forge.etsi.org/rep/mec/gs011-app-enablement-api/blob/master/MecServiceMgmtApi.yaml#L722#/definitions/ServiceInfo" //Outdated

      Config Id Config_MEC_1

@@ -46,9 +46,7 @@ Package MEC_MEC011_SRV_APPSAQ {
               the IUT entity sends a HTTP_RESPONSE containing
                  status_code set to "200 OK"
                  body containing
                     ServiceInfoList containing
                        ServiceInfo set to any_value
                     ;
	                  ServiceInfo set to any_value			// @TODO: Should be a list of ServiceInfos. How can we express it in TDL?
                  ;
               ;
               to the MEC_APP entity
@@ -109,7 +107,7 @@ Package MEC_MEC011_SRV_APPSAQ {
         instances when a new service for a given application instance is registered"

      Reference "ETSI GS MEC 011 2.2.1, clause 8.2.6.3.4",
         "https://forge.etsi.org/gitlab/mec/gs011-app-enablement-api/blob/master/Mp1.yaml#/definitions/ServiceInfo" //Outdated
         "https://forge.etsi.org/rep/mec/gs011-app-enablement-api/blob/master/MecServiceMgmtApi.yaml#L722#/definitions/ServiceInfo" //Outdated

      Config Id Config_MEC_1

@@ -272,7 +270,7 @@ Package MEC_MEC011_SRV_APPSAQ {
         for a given application instance when queried by a MEC Application"

      Reference "ETSI GS MEC 011 2.2.1, clause 8.2.7.3.1",
         "https://forge.etsi.org/gitlab/mec/gs011-app-enablement-api/blob/master/Mp1.yaml#/definitions/ServiceInfo" //Outdated
         "https://forge.etsi.org/rep/mec/gs011-app-enablement-api/blob/master/MecServiceMgmtApi.yaml#L722#/definitions/ServiceInfo" //Outdated

      Config Id Config_MEC_1

@@ -364,7 +362,7 @@ Package MEC_MEC011_SRV_APPSAQ {
         application instance when commanded by a MEC Application"

      Reference "ETSI GS MEC 011 2.2.1, clause 8.2.7.3.2",
         "https://forge.etsi.org/gitlab/mec/gs011-app-enablement-api/blob/master/Mp1.yaml#/definitions/ServiceInfo" //Outdated
         "https://forge.etsi.org/rep/mec/gs011-app-enablement-api/blob/master/MecServiceMgmtApi.yaml#L722#/definitions/ServiceInfo" //Outdated


      Config Id Config_MEC_1
@@ -387,7 +385,6 @@ Package MEC_MEC011_SRV_APPSAQ {
            when {
               the IUT entity receives a vPUT containing
                  uri indicating value "/mec_service_mgmt/v1/applications/{APP_INSTANCE_ID}/services/{SERVICE_ID}",
                  if_match indicating value PROPER_ETAG,
                  body containing
                     ServiceInfo containing
                        version indicating value NEW_VERSION
@@ -441,7 +438,6 @@ Package MEC_MEC011_SRV_APPSAQ {
            when {
               the IUT entity receives a vPUT containing
                  uri indicating value "/mec_service_mgmt/v1/applications/{APP_INSTANCE_ID}/services/{SERVICE_ID}",
                  if_match indicating value PROPER_ETAG,
                  body containing
                     ServiceInfo containing
                        // Wrong parameter name should trigger an error response.
@@ -491,7 +487,6 @@ Package MEC_MEC011_SRV_APPSAQ {
            when {
               the IUT entity receives a vPUT containing
                  uri indicating value "/mec_service_mgmt/v1/applications/{APP_INSTANCE_ID}/services/{NON_EXISTENT_SERVICE_ID}",
                  if_match indicating value PROPER_ETAG,
                  body containing
                     ServiceInfo containing
                        version indicating value NEW_VERSION
@@ -510,7 +505,7 @@ Package MEC_MEC011_SRV_APPSAQ {
         }
   }


/* Removed cause the ETag is not mandatory. Cannot be tested
   Test Purpose {
      TP Id "TP_MEC_MEC011_SRV_APPSAQ_004_PF"

@@ -558,4 +553,6 @@ Package MEC_MEC011_SRV_APPSAQ {
            }
         }
   }

   */
}
+7 −7
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ Package MEC_MEC011_SRV_APPSUB {
         on services availability when queried by a MEC Application"

      Reference "ETSI GS MEC 011 2.2.1, clause 7.2.3.3.1",
         "https://forge.etsi.org/gitlab/mec/gs011-app-enablement-api/blob/master/Mp1.yaml#/definitions/Mp1SubscriptionLinkList" //Outdated
         "https://forge.etsi.org/rep/mec/gs011-app-enablement-api/blob/master/MecAppSupportApi.yaml#L574#/definitions/MecAppSuptApiSubscriptionLinkList" //Outdated

      Config Id Config_MEC_1

@@ -100,10 +100,10 @@ Package MEC_MEC011_SRV_APPSUB {

      Test objective
         "Check that the IUT acknowledges the subscription by a MEC Application
         to notifications on service availability events"
         to notifications on termination events"

      Reference "ETSI GS MEC 011 2.2.1, clause 7.2.3.3.4",
         "https://forge.etsi.org/gitlab/mec/gs011-app-enablement-api/blob/master/Mp1.yaml#/definitions/SerAvailabilityNotificationSubscription" //Outdated
         "https://forge.etsi.org/rep/mec/gs011-app-enablement-api/blob/master/MecAppSupportApi.yaml#L383#/definitions/AppTerminationNotificationSubscription" //Outdated

      Config Id Config_MEC_1

@@ -178,7 +178,7 @@ Package MEC_MEC011_SRV_APPSUB {
                  body containing
                     AppTerminationNotificationSubscription containing
                        // Unknown value should trigger an error response.
                        subscriptionType indicating value INVALID_SUBSCRIPTION,
                        subscriptionType indicating value INVALID_SUBSCRIPTION_TYPE,
                        callbackReference indicating value some_uri
                     ;
                  ;
@@ -204,7 +204,7 @@ Package MEC_MEC011_SRV_APPSUB {
         when queried by a MEC Application"

      Reference "ETSI GS MEC 011 2.2.1, clause 7.2.4.3.1",
        "https://forge.etsi.org/gitlab/mec/gs011-app-enablement-api/blob/master/Mp1.yaml#/definitions/SerAvailabilityNotificationSubscription" //Outdated
        "https://forge.etsi.org/rep/mec/gs011-app-enablement-api/blob/master/MecAppSupportApi.yaml#L383#/definitions/AppTerminationNotificationSubscription" //Outdated

      Config Id Config_MEC_1

@@ -293,8 +293,8 @@ Package MEC_MEC011_SRV_APPSUB {
      TP Id "TP_MEC_MEC011_SRV_APPSUB_004_OK"

      Test objective
         "Check that the IUT acknowledges the unsubscribe from service availability event notifications
         when commanded by a MEC Application"
         "Check that the IUT acknowledges the unsubscribe from app termination
		  event notifications when commanded by a MEC Application"

      Reference "ETSI GS MEC 011 2.2.1, clause 7.2.4.3.5"

+193 −0
Original line number Diff line number Diff line
/*
Copyright (c) ETSI 2018-2021.
Released under BSD 3-clause license. For more information visit https://forge.etsi.org/legal-matters
*/

Package MEC_MEC011_SRV_CONFTASK {

   import all from MEC_Common;


   /*
    * Confirmation Tasks (ready / termination )
    */

   	
   	   Test Purpose {
      TP Id "TP_MEC_MEC011_SRV_CONFTASK_001_OK"

      Test objective
         "Check that the IUT responds that it has completed the application level termination"

      Reference "ETSI GS MEC 011 2.2.1, clause 7.2.11.3.4",
         "https://forge.etsi.org/rep/mec/gs011-app-enablement-api/blob/master/MecAppSupportApi.yaml#L320#/definitions/AppTerminationConfirmation" //Outdated

      Config Id Config_MEC_1

      PICS Selection PIC_MEC_PLAT and PIC_SERVICES

      Initial conditions  with {
         the IUT entity being_in idle_state and
         the IUT entity having a apps_instance containing
            instance_id indicating value APP_INSTANCE_ID
         ;
      }

      // MEC 011 2.2.1, clause 5.2.3
      Expected behaviour
         ensure that {
            when {
               the IUT entity receives a vPOST containing
                  uri indicating value "mec_app_support/v1/applications/{APP_INSTANCE_ID}/confirm_termination"
                  body containing
                     AppTerminationConfirmation containing
                        operationAction indicating value "TERMINATING"
                     ;
                  ;
               ;
               from the MEC_APP entity
            }
            then {
               // MEC 011 2.2.1, clause 7.2.11.3.4
               the IUT entity sends a HTTP_RESPONSE containing
                  status_code set to "204 No Content"
               ;
               to the MEC_APP entity
            }
         }
   }


   Test Purpose {
      TP Id "TP_MEC_MEC011_SRV_CONFTASK_001_NF"

      Test objective
         "Check that the IUT responds with an error when
         a request for an operationAction is sent to an unknown application"

      Reference "ETSI GS MEC 011 2.2.1, clause 7.2.11.3.4"

      Config Id Config_MEC_1

      PICS Selection PIC_MEC_PLAT and PIC_SERVICES

      Initial conditions  with {
         the IUT entity being_in idle_state and
         the IUT entity "not" having a apps_instance containing
            instance_id indicating value NON_EXSITENT_APP_INSTANCE_ID
         ;
      }

      // MEC 011 2.2.1, clause 5.2.8
      Expected behaviour
         ensure that {
            when {
               the IUT entity receives a vPOST containing
                  uri indicating value "mec_app_support/v1/applications/{NON_EXSITENT_APP_INSTANCE_ID}/confirm_termination" 
                  body containing
                     AppTerminationConfirmation containing
                        operationAction indicating value "TERMINATING"
                     ;
                  ;
               ;
               from the MEC_APP entity
            }
            then {
               // MEC 011 2.2.1, clause 7.2.10.3.1
               the IUT entity sends a HTTP_RESPONSE containing
                  status_code set to "404 Not Found"
               ;
               to the MEC_APP entity
            }
         }
   	}
   	
   	   Test Purpose {
      TP Id "TP_MEC_MEC011_SRV_CONFTASK_002_OK"

      Test objective
         "Check that the IUT responds that the MEC application is up and running"

      Reference "ETSI GS MEC 011 2.2.1, clause 7.2.12.3.4",
         "https://forge.etsi.org/rep/mec/gs011-app-enablement-api/blob/master/MecAppSupportApi.yaml#L311#/definitions/AppReadyConfirmation" //Outdated

      Config Id Config_MEC_1

      PICS Selection PIC_MEC_PLAT and PIC_SERVICES

      Initial conditions  with {
         the IUT entity being_in idle_state and
         the IUT entity having a apps_instance containing
            instance_id indicating value APP_INSTANCE_ID
         ;
      }

      // MEC 011 2.2.1, clause 5.2.2
      Expected behaviour
         ensure that {
            when {
               the IUT entity receives a vPOST containing
                  uri indicating value "mec_app_support/v1/applications/{APP_INSTANCE_ID}/confirm_ready"
                  body containing
                     AppReadyConfirmation containing
                        indication indicating value "READY"
                     ;
                  ;
               ;
               from the MEC_APP entity
            }
            then {
               // MEC 011 2.2.1, clause 7.2.12.3.4
               the IUT entity sends a HTTP_RESPONSE containing
                  status_code set to "204 No Content"
               ;
               to the MEC_APP entity
            }
         }
   }


   Test Purpose {
      TP Id "TP_MEC_MEC011_SRV_CONFTASK_002_NF"

      Test objective
         "Check that the IUT responds with an error when
         a request for an indication is sent to an unknown application"

      Reference "ETSI GS MEC 011 2.2.1, clause 7.2.12.3.4"

      Config Id Config_MEC_1

      PICS Selection PIC_MEC_PLAT and PIC_SERVICES

      Initial conditions  with {
         the IUT entity being_in idle_state and
         the IUT entity "not" having a apps_instance containing
            instance_id indicating value NON_EXSITENT_APP_INSTANCE_ID
         ;
      }

      // MEC 011 2.2.1, clause 5.2.8
      Expected behaviour
         ensure that {
            when {
               the IUT entity receives a vPOST containing
                  uri indicating value "mec_app_support/v1/applications/{NON_EXSITENT_APP_INSTANCE_ID}/confirm_ready" 
                  body containing
                     AppReadyConfirmation containing
                        indication indicating value "READY"
                     ;
                  ;
               ;
               from the MEC_APP entity
            }
            then {
               // MEC 011 2.2.1, clause 7.2.12.3.4
               the IUT entity sends a HTTP_RESPONSE containing
                  status_code set to "404 Not Found"
               ;
               to the MEC_APP entity
            }
         }
   	}
}
+7 −7
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ Package MEC_MEC011_SRV_DNS {
         when queried by a MEC Application"

      Reference "ETSI GS MEC 011 2.2.1, clause 7.2.9.3.1",
         "https://forge.etsi.org/gitlab/mec/gs011-app-enablement-api/blob/master/Mp1.yaml#/definitions/DnsRule" //Outdated
         "https://forge.etsi.org/rep/mec/gs011-app-enablement-api/blob/master/MecAppSupportApi.yaml#L507#/definitions/DnsRule" //Outdated

      Config Id Config_MEC_1

@@ -46,9 +46,7 @@ Package MEC_MEC011_SRV_DNS {
               the IUT entity sends a HTTP_RESPONSE containing
                  status_code set to "200 OK"
                  body containing
                     DnsRuleList containing
                        DnsRule set to any_value
                     ;
                     DnsRule set to any_value		//@TODO: Should be a list of DnsRules. How can this be expressed in TDL?
                  ;
               ;
               to the MEC_APP entity
@@ -65,7 +63,7 @@ Package MEC_MEC011_SRV_DNS {
         when queried by a MEC Application"

      Reference "ETSI GS MEC 011 2.2.1, clause 7.2.10.3.1",
         "https://forge.etsi.org/gitlab/mec/gs011-app-enablement-api/blob/master/Mp1.yaml#/definitions/DnsRule" //Outdated
         "https://forge.etsi.org/rep/mec/gs011-app-enablement-api/blob/master/MecAppSupportApi.yaml#L507#/definitions/DnsRule" //Outdated

      Config Id Config_MEC_1

@@ -157,7 +155,7 @@ Package MEC_MEC011_SRV_DNS {
         when commanded by a MEC Application"

      Reference "ETSI GS MEC 011 2.2.1, clause 7.2.10.3.2",
         "https://forge.etsi.org/gitlab/mec/gs011-app-enablement-api/blob/master/Mp1.yaml#/definitions/DnsRule" //Outdated
         "https://forge.etsi.org/rep/mec/gs011-app-enablement-api/blob/master/MecAppSupportApi.yaml#L507#/definitions/DnsRule" //Outdated

      Config Id Config_MEC_1

@@ -300,7 +298,8 @@ Package MEC_MEC011_SRV_DNS {
         }
   }


/* 
 * @TODO: Removed cause the ETag is not a mandatory header attribute 
   Test Purpose {
      TP Id "TP_MEC_MEC011_SRV_DNS_003_PF"

@@ -347,4 +346,5 @@ Package MEC_MEC011_SRV_DNS {
            }
         }
   }
   */
}
+6 −16
Original line number Diff line number Diff line
@@ -41,7 +41,7 @@ Package MEC_MEC011_SRV_LIV {
         ensure that {
            when {
               the IUT entity receives a vGET containing
                  Uri indicating value "link/to/individual/mecServiceLiveness"
                  uri indicating value "link/to/individual/mecServiceLiveness"
               ;
               from the MEC_APP entity
            }
@@ -51,12 +51,7 @@ Package MEC_MEC011_SRV_LIV {
                  status_code set to "200 OK"
                  body containing
                     ServiceLivenessInfo containing
                        ServiceState set to "ACTIVE",
                        interval set to 10,
                        timeStamp containing
                        	seconds set to 10,
                        	nanoseconds set to 0
                    	;
                        ServiceState set to "ACTIVE"
                     ;
                  ;
               ;
@@ -96,7 +91,7 @@ Test Purpose {
         ensure that {
            when {
               the IUT entity receives a vGET containing
                  Uri indicating value "not_existing_link/to/individual/mecServiceLiveness"
                  uri indicating value "not_existing_link/to/individual/mecServiceLiveness"
               ;
               from the MEC_APP entity
            }
@@ -143,7 +138,7 @@ Test Purpose {
                  Uri indicating value "link/to/individual/mecServiceLiveness",
                  body containing
                  ServiceLivenessUpdate containing
                        ServiceState set to "ACTIVE"
                        state set to "ACTIVE"
                     ;
                  ;
               ;
@@ -155,12 +150,7 @@ Test Purpose {
                  status_code set to "200 OK"
                  body containing
                     ServiceLivenessInfo containing
                        ServiceState set to "ACTIVE",
                        interval set to 10,
                        timeStamp containing
                        	seconds set to 10,
                        	nanoseconds set to 0
                    	;
                        state set to "ACTIVE"
                     ;
                  ;
               ;
@@ -202,7 +192,7 @@ Test Purpose {
                  Uri indicating value "link/to/individual/mecServiceLiveness",
                  body containing
                  ServiceLivenessInfo containing
                        ServiceState set to "INACTIVE"
                        state set to "INACTIVE"
                     ;
                  ;
               ;
Loading