Commit e77323af authored by Michele Carignani's avatar Michele Carignani
Browse files

several changes upon review

parent e07057e8
Loading
Loading
Loading
Loading
+38 −41
Original line number Diff line number Diff line
/*
Copyright (c) ETSI 2018.

This software is subject to copyrights owned by ETSI. Non-exclusive permission
is hereby granted, free of charge, to copy, reproduce and amend this file
under the following conditions: It is provided "as is", without warranty of any
kind, expressed or implied.

ETSI shall never be liable for any claim, damages, or other liability arising
from its use or inability of use.This permission does not apply to any documentation
associated with this file for which ETSI keeps all rights reserved. The present
copyright notice shall be included in all copies of whole or part of this
file and shall not imply any sub-license right.
*/
Package app_pkg_mgt {
	
	import all from MEC_Common;
	import all from MEC_012_Domain;
	import all from MEC_010_2_Domain;
	
	Test Purpose {
		TP Id "TP_MEC_APP_PACKAGE_MANAGEMENT_001"
		TP Id "TP_MEC_MEO_MM1_PMG_001"
		
		Test objective 
			"Check that the list of App Packages is returned when 
			it is requested to the MEO"
			"Check that MEO returns the list of App Packages when requested"
		
		Reference "ETSI GS MEC 010-2 1.2.2, clause 7.3.1.3.2", 
		          "https://forge.etsi.org/gitlab/mec/gs016-ue-app-api/blob/master/UEAppInterfaceApi.yaml/#definitions/OnboardedAppPkgInfoList"
		          
		Reference "ETSI GS MEC 010-2 1.2.2, clause 7.3.1.3.2"
		Config Id Config_MEC_2
 		PICS Selection PIC_APP_PACKAGE PIC_APP_PACKAGE_MANAGEMENT
 		PICS Selection PIC_APP_PACKAGE PIC_APP_PACKAGE_MANAGEMENT // TODO add "and"/"or" operator 

		Initial conditions  with {
			the IUT entity having a App_Package containing
				ON_BOARDED_APP_PKG_ID indicating value ON_BOARDED_APP_PKG_ID_VALUE;
				appPkgId indicating value ON_BOARDED_APP_PKG_ID_VALUE,
				appDId indicating value APPD_ID;
		}

 		Expected behaviour
@@ -32,19 +48,7 @@ Package app_pkg_mgt {
				  	OnboardedAppPkgInfoList containing
						OnboardedAppPkgInfo containing 
							appPkgId set to ON_BOARDED_APP_PKG_ID_VALUE,
							appDId set to APPD_ID,
							appName set to APP_NAME,
							appSoftwareVersion set to APP_SW_VERSION,
							appDVersion set to APPD_VERSION,
							checksum set to CHECKSUM,
							softwareImagesList set to SOFTWARE_IMAGES_LIST,
							operationalState set to OPERATIONAL_STATE,
							usageState set to USAGE_STATE,
				  			_link containing
				  				self set to APP_PKG_URI,
								appD set to APPD_URI,
								appPkgContent set to APP_PKG_CONTENT_URI
							;,
							appDId set to APPD_ID
							;
				  		;
					;
@@ -54,7 +58,7 @@ Package app_pkg_mgt {
	}

	Test Purpose {
		TP Id "TP_MEC_APP_PACKAGE_MANAGEMENT_002"
		TP Id "TP_MEC_MEO_MM1_PMG_002"
		
		Test objective 
			"Check that a new App Package is created when 
@@ -65,7 +69,7 @@ Package app_pkg_mgt {
 		PICS Selection PIC_APP_PACKAGE PIC_APP_PACKAGE_MANAGEMENT

		Initial conditions  with {
			the IUT being_in idle_state;
			the IUT entity being_in idle_state
		}

 		Expected behaviour
@@ -83,6 +87,7 @@ Package app_pkg_mgt {
							appPkgPath set to APP_PKG_PATH
						;
					;
				;
			}
			then {
				the IUT entity sends a httpResponse containing
@@ -90,21 +95,13 @@ Package app_pkg_mgt {
				  Message_Body containing 
				  	OnboardedAppPkgInfoList containing
						OnboardedAppPkgInfo containing
							appPkgId set to ON_BOARDED_APP_PKG_ID,
							appDId set to APPD_ID,
							appName set to APP_PKG_NAME,
							appSoftwareVersion set to APP_PKG_VERSION,
							appDVersion set to APPD_VERSION,
						   appPkgName set to APP_PKG_NAME,
                     appPkgVersion set to APP_PKG_VERSION,
                     appProvider set to APP_PROVIDER,
                     checksum set to CHECKSUM,
							softwareImagesList set to SOFTWARE_IMAGES_LIST,
							operationalState set to OPERATIONAL_STATE,
							usageState set to USAGE_STATE,
				  			_link containing
				  				self set to APP_PKG_URI,
								appD set to APPD_URI,
								appPkgContent set to APP_PKG_CONTENT_URI
							;,
                     appPkgPath set to APP_PKG_PATH,
                     operationalState set to "ENABLED",
							usageState set to "NOT_IN_USE"
							;
				  		;
					 ;
+31 −10
Original line number Diff line number Diff line
/*
Copyright (c) ETSI 2018.

This software is subject to copyrights owned by ETSI. Non-exclusive permission
is hereby granted, free of charge, to copy, reproduce and amend this file
under the following conditions: It is provided "as is", without warranty of any
kind, expressed or implied.

ETSI shall never be liable for any claim, damages, or other liability arising
from its use or inability of use.This permission does not apply to any documentation
associated with this file for which ETSI keeps all rights reserved. The present
copyright notice shall be included in all copies of whole or part of this
file and shall not imply any sub-license right.
*/
Package app_pkg_mgt_notifications {
	
	import having from MEC_Common;
	import Config_MEC_2 from MEC_Common;
	import all from MEC_010_2_Domain;
	
	Test Purpose {
		TP Id "TP_MEC_APP_PACKAGE_MANAGEMENT_NOTIFICATIONS_001"
		TP Id "TP_MEC_APP_PACKAGE_MANAGEMENT_NOTIFICATIONS_001" // TODO shorten and align w/ MEC025
		
		Test objective 
			"Check that the MEO sends an App Package management notification to the OSS
@@ -13,17 +28,22 @@ Package app_pkg_mgt_notifications {
		
		Reference "ETSI GS MEC 010-2 1.2.2, clause 7.3.5"
		Config Id Config_MEC_2
 		PICS Selection PIC_APP_PACKAGE PIC_APP_PACKAGE_NOTIFICATIONS
 		PICS Selection PIC_APP_PACKAGE and PIC_APP_PACKAGE_NOTIFICATIONS 

		Initial conditions  with {
			the IUT entity having a App_Package_subscription containing
		   the IUT entity having a AppPackage containing
            appPkgId set to APP_PKG_ID,
            operationalState set to "ENABLED",
            appProvider set to APP_PROVIDER
         ;
			and the IUT entity having a App_Package_subscription containing
				subscriptionId indicating value SUBSCRIPTION_ID, 
				subscriptionType indicating value "OpChange",
				callbackUri indicating value CALLBACK_URI,
				appPkgFilter containing
					appPkgFilterCriteria containing
						appProvider set to APP_PROVIDER
					;,
					;
				;
			;
		}
@@ -31,9 +51,10 @@ Package app_pkg_mgt_notifications {
 		Expected behaviour
		ensure that {
			when {
				the IUT entity generates a app_package_operational_change_event containing
					appProvider set to APP_PROVIDER
				;
				the IUT entity receives a vPUT containing
					appPkgId set to APP_PKG_ID,
					operationalState set to "ENABLED";
				from the MEC_OSS entity
			}
			then {
				the IUT entity sends a vPOST containing
@@ -45,9 +66,9 @@ Package app_pkg_mgt_notifications {
						subscriptionId indicating value SUBSCRIPTION_ID,
						timeStamp set to TIMESTAMP,
						appPkgId set to APP_PKG_ID,
						appDId set to APPD_ID,
					;
						appDId set to APPD_ID
					;
				; to the MEC_SUB entity
			}
		}
	}
+18 −29
Original line number Diff line number Diff line
/*
Copyright (c) ETSI 2018.

This software is subject to copyrights owned by ETSI. Non-exclusive permission
is hereby granted, free of charge, to copy, reproduce and amend this file
under the following conditions: It is provided "as is", without warranty of any
kind, expressed or implied.

ETSI shall never be liable for any claim, damages, or other liability arising
from its use or inability of use.This permission does not apply to any documentation
associated with this file for which ETSI keeps all rights reserved. The present
copyright notice shall be included in all copies of whole or part of this
file and shall not imply any sub-license right.
*/
Package MEC_010_2_Domain {
   
	Domain {
			pics:
			- PIC_APP_PACKAGE			// MEC025, clause 7.3.2
@@ -6,41 +21,15 @@ Package MEC_010_2_Domain {
			- PIC_APP_PACKAGE_NOTIFICATIONS		// MEC025, table 7.3.2-2
			;
			entities:
			- MEC_OSS
			- MEO
			- IUT
			- MEC_SUB
			;
			events:
			- App_Package_subscription
			- App_Package
			- having
			- sends
			- receives
			- generates
			- being_in
			- idle_state
			- app_package_operational_change_event
			;
		}
}

/*
		
 	Domain {
		pics:
		- PIC_RNIS
		;
		entities:
		- RNIS_CLIENT
		- IUT
		;
		events:
		- RNIS_subscription
		- perform_RNIS_subscription_query_to
		- privileges
		- sends
		- receives
		;
}
 No newline at end of file
 
 */
+14 −0
Original line number Diff line number Diff line
/*
Copyright (c) ETSI 2018.

This software is subject to copyrights owned by ETSI. Non-exclusive permission
is hereby granted, free of charge, to copy, reproduce and amend this file
under the following conditions: It is provided "as is", without warranty of any
kind, expressed or implied.

ETSI shall never be liable for any claim, damages, or other liability arising
from its use or inability of use.This permission does not apply to any documentation
associated with this file for which ETSI keeps all rights reserved. The present
copyright notice shall be included in all copies of whole or part of this
file and shall not imply any sub-license right.
*/
Package MEC_011_DATA {
   
   Data { /* To be modified */
+14 −0
Original line number Diff line number Diff line
/*
Copyright (c) ETSI 2018.

This software is subject to copyrights owned by ETSI. Non-exclusive permission
is hereby granted, free of charge, to copy, reproduce and amend this file
under the following conditions: It is provided "as is", without warranty of any
kind, expressed or implied.

ETSI shall never be liable for any claim, damages, or other liability arising
from its use or inability of use.This permission does not apply to any documentation
associated with this file for which ETSI keeps all rights reserved. The present
copyright notice shall be included in all copies of whole or part of this
file and shall not imply any sub-license right.
*/
Package MEC_011_Domain {
   
   import all from MEC_011_DATA;
Loading