Commit eb41b63b authored by liebigan's avatar liebigan
Browse files

Partial IMSI/IMEI in SMS, HTTP field adaptions

parent beb0d878
Loading
Loading
Loading
Loading
+17 −13
Original line number Diff line number Diff line
@@ -46,7 +46,9 @@ Package aml_commons {
						"ei" 	of type Number,
						"mcc" 	of type Number,
						"mnc"	of type Number,
			"ml" 	of type Number	
						"ml" 	of type Number,	
			optional	"al" 	of type Number,
			optional 	"toc" 	of type UTCString
			;
			 
		type HTTP_MESSAGE
@@ -68,7 +70,7 @@ Package aml_commons {
						"device_imei"					of type Number,
						"cell_network_mcc"				of type Number,	
						"cell_network_mnc"				of type Number,							
			optional	"v"								of type Number,
						"v"								of type Number,
			optional 	"emergency_number"				of type String,
			optional 	"source"						of type String,
			optional 	"os_version"					of type String,
@@ -94,6 +96,8 @@ Package aml_commons {
		type UTCString; // YYYYMMDDhhmmss
		type AML_SMS_FORMAT;
		type Radius; // Numeric or 'N'
		type PartialImsi; // MccMnc000000000 (MCC and MNC only, rest 0s)
		type PartialImei; // Complete IMEI or optionally when only SMS is used Handset identifier only, rest 0s
		
		Number AML_VERSION; // 1
		
+207 −209
Original line number Diff line number Diff line
@@ -95,8 +95,10 @@ Package AML {
	                		"lc" 	 containing Number
	                			 		indicating value "the level of confidence";,
	                		"pm" 	 indicating value "('G' | 'W' | 'C')",
	                		"si" 	 corresponding to PX_IMSI,
	                		"ei" 	 corresponding to PX_IMEI,
	                		"si" 	 containing PartialImsi
	                					derived from PX_IMSI;,
	                		"ei" 	 containing PartialImei
	                					derived from PX_IMEI;,
	                		"mcc" 	 corresponding to PX_MCC,
	                		"mnc" 	 corresponding to PX_MNC,
	                		"ml" 	 derived from the value of AML_SMS;
@@ -105,13 +107,10 @@ Package AML {
					}
	        }
			}
	    
			Test Purpose {
				TP Id TP_AML_SMS_BV_04
	    	
				Test objective
    		"Verify that the IUT sends AML via SMS within the timeout T1"
	    	
				Reference
        	"ETSI TS 103 625 V1.1.1, clause 5.1 paragraph 1-2"
	        
@@ -168,8 +167,10 @@ Package AML {
	                					indicating value "when location process was deemed to have failed";,
	                		"lc" 	 set to 0, 
	                		"pm" 	 set to N,
	                		"si" 	 set to PX_IMSI,
	                		"ei" 	 set to PX_IMEI,
	                		"si" 	 containing PartialImsi
	                					derived from PX_IMSI;,
	                		"ei" 	 containing PartialImei
	                					derived from PX_IMEI;,
	                		"mcc" 	 set to PX_MCC,
	                		"mnc" 	 set to PX_MNC,
	                		"ml" 	 derived from the value of AML_SMS_MESSAGE;
@@ -178,19 +179,14 @@ Package AML {
					}
	        }
			}


			Test Purpose {
				TP Id TP_AML_SMS_BV_06

				Test objective
    		"Verify that no record of the AML message is available to the user"

				Reference
        	"ETSI TS 103 625 V1.1.1, clause 5.2 paragraph 2"

	        PICS Selection PICS_SMS_SUPPORT

				Expected behaviour
					ensure that {
					when {
@@ -302,6 +298,7 @@ Package AML {
								Method		set to 'POST',
								ContentType	 set to 'application/x-www-form-urlencoded',
	                	Body containing
	                		"v"				set to 1,
	                	 	"location_latitude"  	indicating value close_to PX_LATITUDE,
	                		"location_longitude" 	indicating value close_to PX_LONGITUDE,	    
							"location_time"			containing Number 
@@ -383,8 +380,9 @@ Package AML {
								Method		set to 'POST',
								ContentType	 set to 'application/x-www-form-urlencoded',
	                	Body containing
	                	 	"location_latitude"  	set to 0,
	                		"location_longitude" 	set to 0,	    
	                		"v"				set to 1,
	                	 	"location_latitude"  	set to '+00.00000',
	                		"location_longitude" 	set to '+000.00000',	    
							"location_time"			containing Number
														indicating value "when location process was deemed to have failed";,
							"location_source"		set to 'Unknown',