Newer
Older
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
469
470
471
472
473
474
475
476
477
478
479
480
481
482
483
484
485
486
487
488
489
490
491
492
493
494
495
496
497
498
499
500
501
502
503
504
505
506
507
508
509
510
511
512
513
514
515
516
517
518
519
520
521
522
523
524
525
526
527
528
529
530
531
532
533
534
535
536
537
538
539
540
541
542
543
544
545
546
547
548
549
550
551
552
553
554
555
556
557
558
559
560
561
562
563
564
565
566
567
568
569
570
571
572
573
574
575
576
577
578
579
580
581
582
583
584
585
586
587
588
589
590
591
592
593
594
595
596
597
598
599
600
601
602
603
604
605
606
607
608
609
610
611
612
613
614
615
616
617
618
619
620
621
622
623
624
625
626
627
628
629
630
631
632
633
634
635
636
637
638
639
640
641
642
643
644
645
646
647
648
649
650
651
652
653
654
655
656
657
658
659
660
661
662
663
664
665
666
667
668
669
670
671
672
673
674
675
676
677
678
679
680
681
682
683
684
685
686
687
688
689
690
691
692
693
694
695
696
697
698
699
700
701
702
703
704
705
706
707
708
709
710
711
712
713
714
715
716
717
718
719
720
721
722
723
724
725
726
727
728
729
730
731
732
733
734
735
736
737
738
739
740
741
742
743
744
745
746
747
748
749
750
751
752
753
754
755
756
757
758
759
760
761
762
763
764
765
766
767
768
769
770
771
772
773
774
775
776
777
778
779
780
781
782
783
784
785
786
787
788
789
790
791
792
793
794
795
796
797
798
799
800
801
802
803
804
805
806
807
808
809
810
811
812
813
814
815
816
817
818
819
820
821
822
823
824
825
826
827
828
829
830
831
832
833
834
835
836
837
838
839
840
841
842
843
844
845
846
847
848
849
850
851
852
853
854
855
856
857
858
859
860
861
862
863
864
865
866
867
868
869
870
871
872
873
874
875
876
877
878
879
880
881
882
883
884
885
886
887
888
889
890
891
892
893
894
895
896
897
898
899
900
901
902
903
904
905
906
907
908
909
910
911
912
913
914
915
916
917
918
919
920
921
922
923
924
925
926
927
928
929
930
931
932
933
934
935
936
937
938
939
940
941
942
943
944
945
946
947
948
949
950
951
952
953
954
955
956
957
958
959
960
961
962
963
964
965
966
967
968
969
970
971
972
973
974
975
976
977
978
979
980
981
982
983
984
985
986
987
988
989
990
991
992
993
994
995
996
997
998
999
1000
Index: BTP/LibItsBtp_Functions.ttcn
===================================================================
--- BTP/LibItsBtp_Functions.ttcn (revision 1312)
+++ BTP/LibItsBtp_Functions.ttcn (working copy)
@@ -41,7 +41,9 @@
utPort.send(p_init);
tc_wait.start;
alt {
- [] utPort.receive(UtInitializeResult:true) {
+//FIXME RGY As discussed, port in type is changed to a top-level union type
+// [] utPort.receive(UtInitializeResult:true) {
+ [] utPort.receive(UtCommonResults:{utInitializeResult:=true}) {
tc_wait.stop;
log("*** f_utInitializeIut: INFO: IUT initialized ***");
}
@@ -94,7 +96,8 @@
/**
* @desc Setups default configuration
*/
- function f_cfUp() runs on ItsBtp system ItsBtpSystem {
+//FIXME RGY Titan doesn't support mtc and system clauses yet
+ function f_cfUp() runs on ItsBtp /*system ItsBtpSystem*/ {
map(self:utPort, system:utPort);
map(self:btpPort, system:btpPort);
@@ -105,7 +108,8 @@
/**
* @desc Deletes default configuration
*/
- function f_cfDown() runs on ItsBtp system ItsBtpSystem {
+//FIXME RGY Titan doesn't support mtc and system clauses yet
+ function f_cfDown() runs on ItsBtp {
unmap(self:utPort, system:utPort);
unmap(self:btpPort, system:btpPort);
@@ -237,4 +241,5 @@
}
} // end getFunctions
-} // end LibItsBtp_Functions
\ No newline at end of file
+
+} // end LibItsBtp_Functions
Index: BTP/LibItsBtp_TestSystem.ttcn
===================================================================
--- BTP/LibItsBtp_TestSystem.ttcn (revision 1312)
+++ BTP/LibItsBtp_TestSystem.ttcn (working copy)
@@ -29,7 +29,9 @@
out
UtInitialize, UtBtpTrigger;
in
- UtInitializeResult, UtBtpTriggerResult, UtBtpEventInd;
+//FIXME RGY!!! As discussed, list of booleans is changed by a top-level union type
+// UtInitializeResult, UtBtpTriggerResult, UtBtpEventInd;
+ UtCommonResults, UtBtpTriggerResult, UtBtpEventInd;
} // end UpperTesterPort
} // end portDefinitions
Index: BTP/LibItsBtp_TypesAndValues.ttcn
===================================================================
--- BTP/LibItsBtp_TypesAndValues.ttcn (revision 1312)
+++ BTP/LibItsBtp_TypesAndValues.ttcn (working copy)
@@ -145,7 +145,12 @@
GenerateBtpB btpB
}
- type boolean UtBtpTriggerResult;
+//FIXME RGY As discussed, boolean results are replaced by a union of the results
+// type boolean UtBtpTriggerResult;
+ type union UtBtpResults {
+ boolean utBtpTriggerResult
+ }
+ type UtBtpResults.utBtpTriggerResult UtBtpTriggerResult;
/**
* @desc Upper Tester message to request triggering of an BTPA message at IUT
Index: CAM/LibItsCam_Functions.ttcn
===================================================================
--- CAM/LibItsCam_Functions.ttcn (revision 1312)
+++ CAM/LibItsCam_Functions.ttcn (working copy)
@@ -33,7 +33,8 @@
import from LibItsCam_TypesAndValues all;
import from LibItsCam_Pics all;
import from LibItsCam_Pixits all;
-
+ import from LibItsCam_EncdecDeclarations all;
+
group utFuntions {
/**
@@ -48,7 +49,9 @@
utPort.send(p_init);
tc_wait.start;
alt {
- [] utPort.receive(UtInitializeResult:true) {
+//FIXME RGY As discussed, port in type is changed to a top-level union type
+// [] utPort.receive(UtInitializeResult:true) {
+ [] utPort.receive(UtCommonResults:{utInitializeResult:=true}) {
tc_wait.stop;
log("*** f_utInitializeIut: INFO: IUT initialized ***");
}
@@ -80,7 +83,9 @@
utPort.send(p_event);
tc_wait.start;
alt {
- [] utPort.receive(UtCamTriggerResult:true) {
+//FIXME RGY As discussed, port in type is changed to a top-level union type
+// [] utPort.receive(UtCamTriggerResult:true) {
+ [] utPort.receive(UpperTesterCamResults:{utCamTriggerResult:=true}) {
tc_wait.stop;
}
[] utPort.receive {
@@ -106,7 +111,9 @@
utPort.send(p_position);
alt {
- [] utPort.receive(UtChangePositionResult:?) {
+//FIXME RGY As discussed, port in type is changed to a top-level union type
+// [] utPort.receive(UtChangePositionResult:?) {
+ [] utPort.receive(UtCommonResults:{utChangePositionResult:=?}) {
tc_wait.stop;
}
[] utPort.receive {
@@ -290,9 +297,10 @@
* @desc Setups default configuration
* @param p_certificateId The certificate identifier the TA shall use in case of secured IUT
*/
+//FIXME RGY Titan doesn't support mtc and system clauses yet
function f_cfUp(
in charstring p_certificateId := PX_CERT_FOR_TS
- ) runs on ItsCam system ItsCamSystem {
+ ) runs on ItsCam /*system ItsCamSystem*/ {
map(self:utPort, system:utPort);
map(self:acPort, system:acPort);
@@ -307,7 +315,8 @@
/**
* @desc Deletes default configuration
*/
- function f_cfDown() runs on ItsCam system ItsCamSystem {
+//FIXME RGY Titan doesn't support mtc and system clauses yet
+ function f_cfDown() runs on ItsCam {
// Initialise secured mode
f_uninitialiseSecuredMode();
@@ -496,4 +505,4 @@
}
} // end of group camGenerators
-} // end LibItsCam_Functions
\ No newline at end of file
+} // end LibItsCam_Functions
Index: CAM/LibItsCam_Templates.ttcn
===================================================================
--- CAM/LibItsCam_Templates.ttcn (revision 1312)
+++ CAM/LibItsCam_Templates.ttcn (working copy)
@@ -23,6 +23,7 @@
// LibItsCommon
import from LibItsCommon_Functions all;
import from LibItsCommon_TypesAndValues all;
+ import from LibItsCommon_ASN1_NamedNumbers all;
// LibItsCam
import from LibItsCam_TestSystem all;
Index: CAM/LibItsCam_TestSystem.ttcn
===================================================================
--- CAM/LibItsCam_TestSystem.ttcn (revision 1312)
+++ CAM/LibItsCam_TestSystem.ttcn (working copy)
@@ -37,7 +37,9 @@
out
AcGnssPrimitive, AcSecPrimitive;
in
- AcGnssResponse, AcGnssDistanceCovered, AcSecResponse;
+//FIXME RGY As discussed, list of boolean result responses is collected into a top-level union
+// AcGnssResponse, AcGnssDistanceCovered, AcSecResponse;
+ AdapterControlResults;
} // end AdapterControlPort
/**
@@ -47,7 +49,9 @@
out
UtInitialize, UtCamTrigger, UtChangePosition, UtActivatePositionTime, UtDeactivatePositionTime;
in
- UtInitializeResult, UtCamTriggerResult, UtChangePositionResult, UtActivatePositionTimeResult, UtDeactivatePositionTimeResult, UtCamEventInd;
+//FIXME RGY As discussed, list of boolean result responses is collected into a top-level union
+// UtInitializeResult, UtCamTriggerResult, UtChangePositionResult, UtActivatePositionTimeResult, UtDeactivatePositionTimeResult, UtCamEventInd;
+ UtCommonResults, UpperTesterCamResults, UtCamEventInd;
} // end UpperTesterPort
} // end portDefinitions
@@ -157,4 +161,4 @@
encode "LibIts_Interface"
} // end interfacePrimitives
-} // End of module LibIts_TestSystem
+} // End of module LibItsCam_TestSystem
Index: CAM/LibItsCam_TypesAndValues.ttcn
===================================================================
--- CAM/LibItsCam_TypesAndValues.ttcn (revision 1312)
+++ CAM/LibItsCam_TypesAndValues.ttcn (working copy)
@@ -104,7 +104,13 @@
/**
* @desc Upper Tester result message of request of triggering of an event at IUT
*/
- type boolean UtCamTriggerResult;
+//FIXME RGY As discussed, simple boolean responses are collected to a union for forward compatibility
+// type boolean UtCamTriggerResult;
+ type union UpperTesterCamResults {
+ boolean utCamTriggerResult
+ }
+
+ type UpperTesterCamResults.utCamTriggerResult UtCamTriggerResult;
/**
* @desc Upper Tester message to check event/status on CAM IUT
Index: Common/LibItsCommon_Functions.ttcn
===================================================================
--- Common/LibItsCommon_Functions.ttcn (revision 1312)
+++ Common/LibItsCommon_Functions.ttcn (working copy)
@@ -20,7 +20,7 @@
// LibIts
import from LibItsCommon_Pixits all;
import from ITS_Container language "ASN.1:1997" all;
- import from DSRC language "ASN.1:1997" all;
+ import from IS_DSRC language "ASN.1:1997" all;
group generalFunctions {
Index: Common/LibItsCommon_Templates.ttcn
===================================================================
--- Common/LibItsCommon_Templates.ttcn (revision 1312)
+++ Common/LibItsCommon_Templates.ttcn (working copy)
@@ -18,7 +18,9 @@
group taPrimitives {
- template (value) AcSecResponse m_acSecResponseSuccess := true;
+//FIXME RGY the simple boolean result has been changed to a union
+// template (value) AcSecResponse m_acSecResponseSuccess := true;
+ template (value) AdapterControlResults m_acSecResponseSuccess := {acSecResponse:=true};
/**
* @desc Enable security support
@@ -42,9 +44,13 @@
}
} // End of template m_acDisableSecurity
- template AcGnssResponse m_acGnssResponseSuccess := true;
+//FIXME RGY As discussed, port in type is changed to a top-level union type
+// template AcGnssResponse m_acGnssResponseSuccess := true;
+ template AdapterControlResults m_acGnssResponseSuccess := {acGnssResponse:=true};
- template AcGnssDistanceCovered m_acGnssDistanceCovered := true;
+//FIXME RGY As discussed, port in type is changed to a top-level union type
+// template AcGnssDistanceCovered m_acGnssDistanceCovered := true;
+ template AdapterControlResults m_acGnssDistanceCovered := {acGnssDistanceCovered:=true};
/**
* @desc Testsystem will load GNSS scenario
Index: Common/LibItsCommon_TypesAndValues.ttcn
===================================================================
--- Common/LibItsCommon_TypesAndValues.ttcn (revision 1312)
+++ Common/LibItsCommon_TypesAndValues.ttcn (working copy)
@@ -30,7 +30,19 @@
/**
* @desc Upper Tester result message of the initialization request
*/
- type boolean UtInitializeResult;
+//FIXME RGY As discussed, Commom top level type for UT results
+ type union UtCommonResults {
+ boolean utInitializeResult,
+ boolean utChangePositionResult,
+ boolean utChangePseudonymResult,
+ boolean utActivatePositionTimeResult,
+ boolean utDeactivatePositionTimeResult,
+ boolean utIvimTerminationResult
+ }
+
+//FIXME RGY As discussed, type is changed to a type derived from UpperTesterResultTypes
+// type boolean UtInitializeResult;
+ type UtCommonResults.utInitializeResult UtInitializeResult;
/**
* @desc Upper Tester message to change the position of IUT. Values a relatives
@@ -44,7 +56,9 @@
/**
* @desc Upper Tester result message of change position request of IUT
*/
- type boolean UtChangePositionResult;
+//FIXME RGY As discussed, type is changed to a type derived from UpperTesterResultTypes
+// type boolean UtChangePositionResult;
+ type UtCommonResults.utChangePositionResult UtChangePositionResult;
/**
* @desc Upper Tester message to change the pseudonym of the DENM IUT
@@ -56,7 +70,9 @@
/**
* @desc Upper Tester result message of the change pseudonym request
*/
- type boolean UtChangePseudonymResult;
+//FIXME RGY As discussed, type is changed to a type derived from UpperTesterResultTypes
+// type boolean UtChangePseudonymResult;
+ type UtCommonResults.utChangePseudonymResult UtChangePseudonymResult;
/**
* @desc Upper Tester message to activate position and/or time
@@ -68,7 +84,9 @@
/**
* @desc Upper Tester result message of the activate position and/or time request
*/
- type boolean UtActivatePositionTimeResult;
+//FIXME RGY As discussed, type is changed to a type derived from UpperTesterResultTypes
+// type boolean UtActivatePositionTimeResult;
+ type UtCommonResults.utActivatePositionTimeResult UtActivatePositionTimeResult;
/**
* @desc Upper Tester message to deactivate position and/or time
@@ -80,7 +98,9 @@
/**
* @desc Upper Tester result message of the deactivate position and/or time request
*/
- type boolean UtDeactivatePositionTimeResult;
+//FIXME RGY As discussed, type is changed to a type derived from UpperTesterResultTypes
+// type boolean UtDeactivatePositionTimeResult;
+ type UtCommonResults.utDeactivatePositionTimeResult UtDeactivatePositionTimeResult;
}
with {
@@ -118,7 +138,9 @@
/**
* @desc Primitive for receiving response from TA
*/
- type boolean AcSecResponse;
+//FIXME RGY As discussed, type is changed to a type derived from AdapterControlResults
+// type boolean AcSecResponse;
+ type AdapterControlResults.acSecResponse AcSecResponse;
/**
* @desc TA primitives for GNSS
@@ -139,12 +161,23 @@
/**
* @desc Primitive for receiving response from TA
*/
- type boolean AcGnssResponse;
+//FIXME RGY As discussed, Commom adapter control results are collected to a top-level union type
+ type union AdapterControlResults {
+ boolean acGnssResponse,
+ boolean acGnssDistanceCovered,
+ boolean acSecResponse
+ }
+//FIXME RGY As discussed, boolean results are replaced by related fields of the top-level reult union
+// type boolean AcGnssResponse;
+ type AdapterControlResults.acGnssResponse AcGnssResponse;
+
/**
* @desc Primitive for receiving an indication if requested distance was covered from TA
*/
- type boolean AcGnssDistanceCovered;
+//FIXME RGY As discussed, boolean results are replaced by related fields of the top-level reult union
+// type boolean AcGnssDistanceCovered;
+ type AdapterControlResults.acGnssDistanceCovered AcGnssDistanceCovered;
/**
* @desc Primitive for loading a scenario
Index: DCC/LibItsDcc_Functions.ttcn
===================================================================
--- DCC/LibItsDcc_Functions.ttcn (revision 1312)
+++ DCC/LibItsDcc_Functions.ttcn (working copy)
@@ -933,12 +933,13 @@
group externalFunction {
- /**
- * @desc Returns the string representation of the float value
- * @param p_float The float value
- * @return The string representation of the float value
+ /**
+ * @desc Returns the string representation of the float value
+ * @param p_float The float value
+ * @return The string representation of the float value
*/
- external function fx_float2str(float p_float) return charstring;
-
+ function fx_float2str(float p_float) return charstring {
+ return float2str(p_float)
+ }
}
} // End of module LibItsDcc_Functions
\ No newline at end of file
Index: DCC/LibItsDcc_TestSystem.ttcn
===================================================================
--- DCC/LibItsDcc_TestSystem.ttcn (revision 1312)
+++ DCC/LibItsDcc_TestSystem.ttcn (working copy)
@@ -49,7 +49,9 @@
* @desc Check Port used for intercomponent exchange of data to check
*/
type port CheckPort message {
- inout all;
+//FIXME RGY "all" is not supported by Titan in port message lists; only integers are sent and received via checkPort-s;
+// inout all;
+ inout integer;
}
} // end portDefinitions
Index: DENM/LibItsDenm_Functions.ttcn
===================================================================
--- DENM/LibItsDenm_Functions.ttcn (revision 1312)
+++ DENM/LibItsDenm_Functions.ttcn (working copy)
@@ -47,7 +47,9 @@
utPort.send(p_init);
tc_wait.start;
alt {
- [] utPort.receive(UtInitializeResult:true) {
+//FIXME RGY As discussed, port in type is changed to a top-level union type
+// [] utPort.receive(UtInitializeResult:true) {
+ [] utPort.receive(UtCommonResults:{utInitializeResult:=true}) {
tc_wait.stop;
log("*** " & testcasename() & ": INFO: IUT initialized ***");
}
@@ -77,11 +79,15 @@
utPort.send(p_change);
tc_wait.start;
alt {
- [] utPort.receive(UtChangePseudonymResult:true) {
+//FIXME RGY As discussed, port in type is changed to a top-level union type
+// [] utPort.receive(UtChangePseudonymResult:true) {
+ [] utPort.receive(UtCommonResults:{utChangePseudonymResult:=true}) {
tc_wait.stop;
log("*** " & testcasename() & ": INFO: IUT pseudonym changed ***");
}
- [] utPort.receive(UtChangePseudonymResult:false) {
+//FIXME RGY As discussed, port in type is changed to a top-level union type
+// [] utPort.receive(UtChangePseudonymResult:false) {
+ [] utPort.receive(UtCommonResults:{utChangePseudonymResult:=false}) {
tc_wait.stop;
log("*** " & testcasename() & ": INFO: IUT pseudonym changed ***");
f_selfOrClientSyncAndVerdict("error", e_error);
@@ -181,7 +187,9 @@
utPort.send(p_event);
tc_wait.start;
alt {
- [] utPort.receive(UtDenmTerminationResult:?) {
+//FIXME RGY As discussed, port in type is changed to a top-level union type
+// [] utPort.receive(UtDenmTerminationResult:?) {
+ [] utPort.receive(UtDENMResults:{utDenmTerminationResult:=?}) {
tc_wait.stop;
}
[] tc_wait.timeout {
@@ -212,7 +220,9 @@
utPort.send(p_position);
tc_wait.start;
alt {
- [] utPort.receive(UtChangePositionResult:?) {
+//FIXME RGY As discussed, port in type is changed to a top-level union type
+// [] utPort.receive(UtChangePositionResult:?) {
+ [] utPort.receive(UtCommonResults:{utChangePositionResult:=?}) {
tc_wait.stop;
}
[] tc_wait.timeout {
@@ -386,7 +396,8 @@
*/
function f_cfUp(
in charstring p_certificateId := PX_CERT_FOR_TS
- ) runs on ItsDenm system ItsDenmSystem {
+//FIXME RGY Titan doesn't support mtc and system clauses yet
+ ) runs on ItsDenm /*system ItsDenmSystem*/ {
map(self:acPort, system:acPort);
map(self:utPort, system:utPort);
@@ -401,7 +412,8 @@
/**
* @desc Deletes default configuration
*/
- function f_cfDown() runs on ItsDenm system ItsDenmSystem {
+//FIXME RGY Titan doesn't support mtc and system clauses yet
+ function f_cfDown() runs on ItsDenm /*system ItsDenmSystem*/ {
// Initialise secured mode
f_uninitialiseSecuredMode();
@@ -550,7 +562,9 @@
)
);
- return valueof(p_denm.management).actionID;
+//FIXME RGY Titan doesn't support dot notation after valueof at the moment
+// return valueof(p_denm.management).actionID;
+ return valueof(p_denm.management.actionID);
}
} // end sendFunctions
Index: DENM/LibItsDenm_Templates.ttcn
===================================================================
--- DENM/LibItsDenm_Templates.ttcn (revision 1312)
+++ DENM/LibItsDenm_Templates.ttcn (working copy)
@@ -23,6 +23,7 @@
import from LibItsCommon_TypesAndValues all;
import from LibItsCommon_Functions all;
import from LibItsCommon_Pixits all;
+ import from LibItsCommon_ASN1_NamedNumbers all;
// LibItsDenm
import from LibItsDenm_TestSystem all;
@@ -83,7 +84,9 @@
* @param p_gnLifetime GN packet lifetime value (ms)
* @param p_gnTrafficClass GN traffic class value
*/
- template DenmInd mw_denmIndWithGnParameters (
+//FIXME RGY template restriction can be the same as its base template: used in receiving operations only, where single "omit" is not allowed
+// template DenmInd mw_denmIndWithGnParameters (
+ template(present) DenmInd mw_denmIndWithGnParameters (
template (present) DENM p_denMsg,
in template UInt8 p_gnNextHeader := *,
in template UInt8 p_gnHeaderType := *,
@@ -104,7 +107,8 @@
* @param p_ssp SSP security parameter
* @param p_its_aid ITS-AID value
*/
- template DenmInd mw_denmIndWithSecurityParameters(
+//FIXME RGY Titan currently requires the modifyied template to have the same restriction as the base template
+ template (present) DenmInd mw_denmIndWithSecurityParameters(
template (present) DENM p_denMsg,
template Bit256 p_ssp := *,
template UInt32 p_its_aid := c_its_aid_DENM
@@ -119,7 +123,9 @@
* @param p_btpDestinationPort BTP destination port value
* @param p_btpInfo BTP destination port info value (if BTP-B) or BTP source port value (if BTP-A)
*/
- template DenmInd mw_denmIndWithBtpParameters (
+//FIXME RGY template restriction can be the same as its base template: template is not used currently
+// template DenmInd mw_denmIndWithBtpParameters (
+ template(present) DenmInd mw_denmIndWithBtpParameters (
template (present) DENM p_denMsg,
in template UInt16 p_btpDestinationPort := *,
in template UInt16 p_btpInfo := *
@@ -350,8 +356,10 @@
template (value) Longitude p_longitude := f_getTsLongitude(),
template (value) Latitude p_latitude := f_getTsLatitude()
) := {
+//FIXME RGY ReferencePosition is sequence, where latitude preceeds longitude
+// longitude := p_longitude,
+ latitude := p_latitude,
longitude := p_longitude,
- latitude := p_latitude,
positionConfidenceEllipse := m_posConfidenceEllipse,
altitude := m_altitude
}
@@ -577,7 +585,7 @@
eventPosition := ?,
relevanceDistance := *,
relevanceTrafficDirection := *,
- validityDuration := *, // It seems that a default value can be omitted (asn1studio)
+ validityDuration := ?, // It seems that a default value can be omitted (asn1studio)
transmissionInterval := *,
stationType := ?
}
@@ -704,7 +712,7 @@
deltaLongitude := 0,
deltaAltitude := 0
},
- pathDeltaTime := 0
+ pathDeltaTime := 1
}
}
},
Index: DENM/LibItsDenm_TestSystem.ttcn
===================================================================
--- DENM/LibItsDenm_TestSystem.ttcn (revision 1312)
+++ DENM/LibItsDenm_TestSystem.ttcn (working copy)
@@ -37,7 +37,9 @@
out
AcGnssPrimitive, AcSecPrimitive;
in
- AcGnssResponse, AcGnssDistanceCovered, AcSecResponse;
+//FIXME RGY!!! As discussed, list of booleans is changed by a top-level union type
+// AcGnssResponse, AcGnssDistanceCovered, AcSecResponse;
+ AdapterControlResults
} // end AdapterControlPort
/**
@@ -47,8 +49,11 @@
out
UtInitialize, UtDenmTrigger, UtDenmUpdate, UtDenmTermination, UtChangePosition, UtChangePseudonym;
in
- UtInitializeResult, UtDenmTriggerResult, UtDenmUpdateResult, UtDenmTerminationResult,
- UtChangePositionResult, UtChangePseudonymResult, UtDenmEventInd;
+//FIXME RGY! As discussed, list of booleans is changed by a top-level union type
+// UtInitializeResult, UtDenmTriggerResult, UtDenmUpdateResult, UtDenmTerminationResult,
+// UtChangePositionResult, UtChangePseudonymResult, UtDenmEventInd;
+ UtCommonResults, UtDENMResults, UtDenmTriggerResult,
+ UtDenmUpdateResult, UtDenmEventInd;
} // end UpperTesterPort
} // end portDefinitions
Index: DENM/LibItsDenm_TypesAndValues.ttcn
===================================================================
--- DENM/LibItsDenm_TypesAndValues.ttcn (revision 1312)
+++ DENM/LibItsDenm_TypesAndValues.ttcn (working copy)
@@ -117,12 +117,21 @@
ActionID actionId
}
+//FIXME RGY As discussed, boolean result types are replaced by a top-level union of the results
/**
- * @desc Upper Tester result message of termination of an event on DENM IUT
+ * @desc Upper Tester response message for all DENM results
*/
- type boolean UtDenmTerminationResult;
+ type union UtDENMResults {
+ boolean utDenmTerminationResult
+ }
/**
+ * @desc Upper Tester result message of termination of an event on DENM IUT
+ */
+//FIXME RGY As discussed, boolean result types are replaced by a top-level union type
+// type boolean UtDenmTerminationResult;
+ type UtDENMResults.utDenmTerminationResult UtDenmTerminationResult;
+ /**
* @desc Upper Tester message to check event/status on DENM IUT
*/
type record UtDenmEventInd {
Index: GeoNetworking/LibItsGeoNetworking_Functions.ttcn
===================================================================
--- GeoNetworking/LibItsGeoNetworking_Functions.ttcn (revision 1312)
+++ GeoNetworking/LibItsGeoNetworking_Functions.ttcn (working copy)
@@ -1,5 +1,5 @@
/**
- * @author ETSI / STF405 / STF449 / STF484 / STF517
+ * @author ETSI / STF405 / STF449
* @version $URL$
* $Id$
* @desc Module containing functions for GeoNetworking
@@ -38,6 +38,7 @@
import from LibItsGeoNetworking_Templates all;
import from LibItsGeoNetworking_Pixits all;
import from LibItsGeoNetworking_Pics all;
+ import from LibItsGeoNetworking_EncdecDeclarations all;
group utFuntions {
@@ -154,7 +155,8 @@
* - Area2 which only includes NodeB
* NodeB being close to the area center
*/
- function f_cf01Up(Scenario p_scenario := e_staticPosition) runs on ItsGeoNetworking system ItsGeoNetworkingSystem {
+//FIXME RGY Titan doesn't support mtc and system clauses yet
+ function f_cf01Up(Scenario p_scenario := e_staticPosition) runs on ItsGeoNetworking {
// Variables
var PositionTable v_positionTable := {};
@@ -182,7 +184,8 @@
} // end f_cf01Up
- function f_cf01Down() runs on ItsGeoNetworking system ItsGeoNetworkingSystem {
+//FIXME RGY Titan doesn't support mtc and system clauses yet
+ function f_cf01Down() runs on ItsGeoNetworking {
f_uninitialiseSecuredMode();
@@ -207,7 +210,9 @@
*
* @param p_mainUtComponent Name of the component that will initialize IUT and handle default UT messages
*/
- function f_cf02Up(in charstring p_mainUtComponent := c_compMTC, Scenario p_scenario := e_staticPosition) runs on ItsMtc mtc ItsMtc system ItsGeoNetworkingSystem {
+
+//FIXME RGY Titan doesn't support mtc and system clauses yet
+ function f_cf02Up(in charstring p_mainUtComponent := c_compMTC, Scenario p_scenario := e_staticPosition) runs on ItsMtc /*mtc ItsMtc */ {
// Variables
var PositionTable v_positionTable := {};
@@ -255,14 +260,10 @@
// Initialize components
for(i:=0; i < lengthof(vc_componentTable); i:=i+1) {
- if (isvalue(vc_componentTable[i].gnComponent)) {
- vc_componentTable[i].gnComponent.start(f_initialiseComponent(v_positionTable, v_areaTable, vc_componentTable[i].componentName));
- }
+ vc_componentTable[i].gnComponent.start(f_initialiseComponent(v_positionTable, v_areaTable, vc_componentTable[i].componentName));
}
for(i:=0; i < lengthof(vc_componentTable); i:=i+1) {
- if (isvalue(vc_componentTable[i].gnComponent)) {
- vc_componentTable[i].gnComponent.done;
- }
+ vc_componentTable[i].gnComponent.done;
}
} // end f_cf02Up
@@ -270,7 +271,9 @@
/**
* @desc Deletes configuration cf02
*/
- function f_cf02Down() runs on ItsMtc mtc ItsMtc system ItsGeoNetworkingSystem {
+
+//FIXME RGY Titan doesn't support mtc and system clauses yet
+ function f_cf02Down() runs on ItsMtc /*mtc ItsMtc*/ {
// Local variables
var integer i;
@@ -301,7 +304,8 @@
* NodeB being close to the area center
* @param p_mainUtComponent Name of the component that will initialize IUT and handle default UT messages
*/
- function f_cf03Up(in charstring p_mainUtComponent := c_compMTC, Scenario p_scenario := e_staticPosition) runs on ItsMtc mtc ItsMtc system ItsGeoNetworkingSystem {
+//FIXME RGY Titan doesn't support mtc and system clauses yet
+ function f_cf03Up(in charstring p_mainUtComponent := c_compMTC, Scenario p_scenario := e_staticPosition) runs on ItsMtc /*mtc ItsMtc*/ {
// Variables
var PositionTable v_positionTable := {};
@@ -349,14 +353,10 @@
// Initialize components
for(i:=0; i < lengthof(vc_componentTable); i:=i+1) {
- if (isvalue(vc_componentTable[i].gnComponent)) {
- vc_componentTable[i].gnComponent.start(f_initialiseComponent(v_positionTable, v_areaTable, vc_componentTable[i].componentName));
- }
+ vc_componentTable[i].gnComponent.start(f_initialiseComponent(v_positionTable, v_areaTable, vc_componentTable[i].componentName));
}
for(i:=0; i < lengthof(vc_componentTable); i:=i+1) {
- if (isvalue(vc_componentTable[i].gnComponent)) {
- vc_componentTable[i].gnComponent.done;
- }
+ vc_componentTable[i].gnComponent.done;
}
} // end f_cf03Up
@@ -364,7 +364,9 @@
/**
* @desc Deletes configuration cf03
*/
- function f_cf03Down() runs on ItsMtc mtc ItsMtc system ItsGeoNetworkingSystem {
+
+ //FIXME RGY Titan doesn't support mtc and system clauses yet
+ function f_cf03Down() runs on ItsMtc /*mtc ItsMtc*/ {
// Local variables
var integer i;
@@ -397,7 +399,9 @@
* NodeB being close to the area center
* @param p_mainUtComponent Name of the component that will initialize IUT and handle default UT messages
*/
- function f_cf04Up(in charstring p_mainUtComponent := c_compMTC, Scenario p_scenario := e_staticPosition) runs on ItsMtc mtc ItsMtc system ItsGeoNetworkingSystem {
+
+//FIXME RGY Titan doesn't support mtc and system clauses yet
+ function f_cf04Up(in charstring p_mainUtComponent := c_compMTC, Scenario p_scenario := e_staticPosition) runs on ItsMtc /*mtc ItsMtc*/ {
// Variables
var PositionTable v_positionTable := {};
@@ -445,14 +449,10 @@
// Initialize components
for(i:=0; i < lengthof(vc_componentTable); i:=i+1) {
- if (isvalue(vc_componentTable[i].gnComponent)) {
- vc_componentTable[i].gnComponent.start(f_initialiseComponent(v_positionTable, v_areaTable, vc_componentTable[i].componentName));
- }
+ vc_componentTable[i].gnComponent.start(f_initialiseComponent(v_positionTable, v_areaTable, vc_componentTable[i].componentName));
}
for(i:=0; i < lengthof(vc_componentTable); i:=i+1) {
- if (isvalue(vc_componentTable[i].gnComponent)) {
- vc_componentTable[i].gnComponent.done;
- }
+ vc_componentTable[i].gnComponent.done;
}
} // end f_cf04Up
@@ -460,7 +460,9 @@
/**
* @desc Deletes configuration cf04
*/
- function f_cf04Down() runs on ItsMtc mtc ItsMtc system ItsGeoNetworkingSystem {
+
+//FIXME RGY Titan doesn't support mtc and system clauses yet
+ function f_cf04Down() runs on ItsMtc /*mtc ItsMtc*/ {
// Local variables
var integer i;
@@ -489,7 +491,9 @@
* - Area1 which only includes NodeB, NodeD and IUT
* @param p_mainUtComponent Name of the component that will initialize IUT and handle default UT messages
*/
- function f_cf05Up(in charstring p_mainUtComponent := c_compMTC, Scenario p_scenario := e_staticPosition) runs on ItsMtc mtc ItsMtc system ItsGeoNetworkingSystem {
+
+//FIXME RGY Titan doesn't support mtc and system clauses yet
+ function f_cf05Up(in charstring p_mainUtComponent := c_compMTC, Scenario p_scenario := e_staticPosition) runs on ItsMtc /*mtc ItsMtc*/ {
// Variables
var PositionTable v_positionTable := {};
@@ -537,14 +541,10 @@
// Initialize components
for(i:=0; i < lengthof(vc_componentTable); i:=i+1) {
- if (isvalue(vc_componentTable[i].gnComponent)) {
- vc_componentTable[i].gnComponent.start(f_initialiseComponent(v_positionTable, v_areaTable, vc_componentTable[i].componentName));
- }
+ vc_componentTable[i].gnComponent.start(f_initialiseComponent(v_positionTable, v_areaTable, vc_componentTable[i].componentName));
}
for(i:=0; i < lengthof(vc_componentTable); i:=i+1) {
- if (isvalue(vc_componentTable[i].gnComponent)) {
- vc_componentTable[i].gnComponent.done;
- }
+ vc_componentTable[i].gnComponent.done;
}
}
@@ -551,7 +551,9 @@
/**
* @desc Deletes configuration cf05
*/
- function f_cf05Down() runs on ItsMtc mtc ItsMtc system ItsGeoNetworkingSystem {
+
+//FIXME RGY Titan doesn't support mtc and system clauses yet
+ function f_cf05Down() runs on ItsMtc /*mtc ItsMtc*/ {
// Local variables
var integer i;
@@ -581,7 +583,8 @@
* - IUT not in sectorial area of NodeB-NodeF
* @param p_mainUtComponent Name of the component that will initialize IUT and handle default UT messages
*/
- function f_cf06Up(in charstring p_mainUtComponent := c_compMTC, Scenario p_scenario := e_staticPosition) runs on ItsMtc mtc ItsMtc system ItsGeoNetworkingSystem {
+//FIXME RGY Titan doesn't support mtc and system clauses yet
+ function f_cf06Up(in charstring p_mainUtComponent := c_compMTC, Scenario p_scenario := e_staticPosition) runs on ItsMtc /*mtc ItsMtc*/ {
// Variables
var PositionTable v_positionTable := {};
@@ -629,14 +632,10 @@
// Initialize components
for(i:=0; i < lengthof(vc_componentTable); i:=i+1) {
- if (isvalue(vc_componentTable[i].gnComponent)) {
- vc_componentTable[i].gnComponent.start(f_initialiseComponent(v_positionTable, v_areaTable, vc_componentTable[i].componentName));
- }
+ vc_componentTable[i].gnComponent.start(f_initialiseComponent(v_positionTable, v_areaTable, vc_componentTable[i].componentName));
}
for(i:=0; i < lengthof(vc_componentTable); i:=i+1) {
- if (isvalue(vc_componentTable[i].gnComponent)) {
- vc_componentTable[i].gnComponent.done;
- }
+ vc_componentTable[i].gnComponent.done;
}
}
@@ -643,7 +642,9 @@
/**
* @desc Deletes configuration cf06
*/
- function f_cf06Down() runs on ItsMtc mtc ItsMtc system ItsGeoNetworkingSystem {
+
+//FIXME RGY Titan doesn't support mtc and system clauses yet
+ function f_cf06Down() runs on ItsMtc /*mtc ItsMtc*/ {
// Local variables
var integer i;
@@ -672,7 +673,9 @@
* - Area1 which only includes NodeB, NodeD and IUT
* @param p_mainUtComponent Name of the component that will initialize IUT and handle default UT messages
*/
- function f_cf07Up(in charstring p_mainUtComponent := c_compMTC, Scenario p_scenario := e_staticPosition) runs on ItsMtc mtc ItsMtc system ItsGeoNetworkingSystem {
+
+//FIXME RGY Titan doesn't support mtc and system clauses yet
+ function f_cf07Up(in charstring p_mainUtComponent := c_compMTC, Scenario p_scenario := e_staticPosition) runs on ItsMtc /*mtc ItsMtc*/ {
// Variables
var PositionTable v_positionTable := {};
@@ -720,14 +723,10 @@
// Initialize components
for(i:=0; i < lengthof(vc_componentTable); i:=i+1) {
- if (isvalue(vc_componentTable[i].gnComponent)) {
- vc_componentTable[i].gnComponent.start(f_initialiseComponent(v_positionTable, v_areaTable, vc_componentTable[i].componentName));
- }
+ vc_componentTable[i].gnComponent.start(f_initialiseComponent(v_positionTable, v_areaTable, vc_componentTable[i].componentName));
}
for(i:=0; i < lengthof(vc_componentTable); i:=i+1) {
- if (isvalue(vc_componentTable[i].gnComponent)) {
- vc_componentTable[i].gnComponent.done;
- }
+ vc_componentTable[i].gnComponent.done;
}
}
@@ -734,7 +733,8 @@
/**
* @desc Deletes configuration cf06
*/
- function f_cf07Down() runs on ItsMtc mtc ItsMtc system ItsGeoNetworkingSystem {
+//FIXME RGY Titan doesn't support mtc and system clauses yet
+ function f_cf07Down() runs on ItsMtc /*mtc ItsMtc*/ {
// Local variables
var integer i;
@@ -832,12 +832,7 @@
for (i:=0; i<lengthof(vc_componentTable); i:=i+1) {
if (vc_componentTable[i].componentName == p_componentName) {
- if (isvalue(vc_componentTable[i].gnComponent)) {
- v_return := valueof(vc_componentTable[i].gnComponent);
- }
- else {
- testcase.stop(__SCOPE__ & " can not handle omitted GN components");
- }
+ v_return := vc_componentTable[i].gnComponent;
}
}
@@ -910,8 +905,9 @@
position := p_positionValue
};
}
-
- function @deterministic f_fillTimestamp(inout LongPosVector v_vector)
+//FIXME RGY Titan doesn't support @deterministic yet
+// function @deterministic f_fillTimestamp(inout LongPosVector v_vector)
+ function f_fillTimestamp(inout LongPosVector v_vector)
return LongPosVector {
if (v_vector.timestamp_ == 0) {
v_vector.timestamp_ := f_computeGnTimestamp();
@@ -938,7 +934,9 @@
}
}
-/*Spirent removed*/
+ if (isbound(v_return) and (v_return.timestamp_ == 0)) {
+ v_return.timestamp_ := f_computeGnTimestamp();
+ }
return v_return;
}
/**
@@ -1587,12 +1585,12 @@
var LongPosVector v_repDstPosVector;
[vc_gnDefaultActive] a_receiveLsRequest(p_reqSeqNumber, p_mid, v_repDstPosVector) {
- f_sendGeoNetMessage(m_geoNwReq_linkLayerBroadcast(m_geoNwPdu(
+ f_sendGeoNetMessage(valueof(m_geoNwReq_linkLayerBroadcast(m_geoNwPdu(
m_geoNwLsReplyPacket(
p_repSrcPosVector,
f_longPosVector2ShortPosVector(v_repDstPosVector),
vc_localSeqNumber
- ))));
+ )))));
}
}
@@ -1689,12 +1687,14 @@
var GeoNetworkingInd v_msg;
f_sendGeoNetMessage(
- m_geoNwReq_linkLayerBroadcast(
- m_geoNwPdu(
- m_geoNwLsRequestPacket(
- p_reqSrcPosVector,
- p_reqSeqNumber,
- p_gnAddress
+ valueof(
+ m_geoNwReq_linkLayerBroadcast(
+ m_geoNwPdu(
+ m_geoNwLsRequestPacket(
+ p_reqSrcPosVector,
+ p_reqSeqNumber,
+ p_gnAddress
+ )
)
)
)
@@ -2520,7 +2520,9 @@
mw_geoNwSecPdu(
p_InSecMsg,
mw_geoNwAnyPacket_withPayload(?)
- ))) -> value (v_geoNw) {
+//FIXME RGY Titan doesn't support storing list at the moment
+// ))) -> value (v_geoNw) {
+ ))) -> value v_geoNw {
p_received := f_getSecuredMessage(v_geoNw.msgIn);
}
}
@@ -2778,8 +2780,7 @@
f_HashedId3FromHashedId8(
valueof(p_digest)
))
- },
- ""
+ }
);
// Build secured Gn packet
Index: GeoNetworking/LibItsGeoNetworking_Templates.ttcn
===================================================================
--- GeoNetworking/LibItsGeoNetworking_Templates.ttcn (revision 1312)
+++ GeoNetworking/LibItsGeoNetworking_Templates.ttcn (working copy)
@@ -21,6 +21,7 @@
// LibItsBtp
import from LibItsBtp_Templates all;
+ import from LibItsBtp_EncdecDeclarations all;
// LibItsSecurity
import from LibItsSecurity_TypesAndValues all;
@@ -34,6 +35,7 @@
import from LibItsGeoNetworking_TestSystem all;