diff -r 6b1d113cdff3 -r 6638e7f4bd8f telephonyprotocols/secondarypdpcontextumtsdriver/te_spudNetworkSide/configs/te_spudNetworkSide_r4_and_r5.ini
--- a/telephonyprotocols/secondarypdpcontextumtsdriver/te_spudNetworkSide/configs/te_spudNetworkSide_r4_and_r5.ini	Mon May 03 13:37:20 2010 +0300
+++ b/telephonyprotocols/secondarypdpcontextumtsdriver/te_spudNetworkSide/configs/te_spudNetworkSide_r4_and_r5.ini	Thu May 06 15:10:38 2010 +0100
@@ -1,289 +1,289 @@
-[ESockCheck]
-SimTsyTestNum = 0
-
-[PrimaryActivationOk1301]
-SimTsyTestNum = 1301
-PrimaryIapId1 = 2
-PrimaryActivationErr1 = 0
-SubConnectionCount1 = 0
-SubConnectionCount2 = 2
-PolicySelector = 1
-ParametersType = UmtsR99QoSAndOnTableRecord
-ParametersRecordId = 1
-
-[PrimaryActivationOk1302]
-SimTsyTestNum = 1302
-PrimaryIapId1 = 11
-PrimaryActivationErr1 = 0
-SubConnectionCount1 = 0
-SubConnectionCount2 = 2
-PolicySelector = 1
-ParametersType = UmtsR99QoSAndOnTableRecord
-ParametersRecordId = 1
-
-[SecondaryActivationOk1303]
-SimTsyTestNum = 1302
-PrimaryIapId1 = 11
-SubConnectionCount1 = 0
-SubConnectionCount2 = 2
-PolicySelector = 1
-ParametersType = UmtsR99QoSAndOnTableRecord
-ParametersRecordId = 1
-
-[PrimaryActivationFails1304]
-SimTsyTestNum = 1304
-PrimaryIapId1 = 2
-PrimaryActivationErr1 = -19
-
-[PrimaryActivationFails1305]
-SimTsyTestNum = 1305
-PrimaryIapId1 = 11
-PrimaryActivationErr1 = -19
-
-[SecondaryActivationFails1306]
-SimTsyTestNum = 1306
-PrimaryIapId1 = 11
-SecondaryActivationEvent1 = EQoSEventAddPolicy
-SecondaryActivationEvent2 = EQoSEventFailure
-SecondaryActivationEvent2Reason = -19
-SubConnectionCount1 = 0
-SubConnectionCount2 = 2
-PolicySelector = 2
-ParametersType = UmtsR99QoSAndOnTableRecord
-ParametersRecordId = 1
-
-[PrimaryQoSEventDelete1307]
-SimTsyTestNum = 1301
-PrimaryIapId1 = 2
-PrimaryActivationErr1 = 0
-QoSEventReq1 = EContextStatusChange
-QoSEventReq1Idx = 0
-ExpectedNifProgress = 8000
-ExpectedNifError    = -36
-
-[PrimaryQoSEventDelete1308]
-SimTsyTestNum = 1302
-PrimaryIapId1 = 11
-PrimaryActivationErr1 = 0
-QoSEventReq1 = EContextStatusChange
-QoSEventReq1Idx = 0
-ExpectedNifProgress = 8000
-ExpectedNifError    = -36
-
-[ENetworkQoSChangePrimary1311]
-SimTsyTestNum = 1301
-PrimaryIapId1 = 2
-PrimaryActivationErr1 = 0
-QoSEventReq1 = ENetworkQoSChange
-QoSEventReq1Idx = 0
-ExpectedNifProgress = 8000
-ExpectedNifError    = -33
-
-[ENetworkQoSChangePrimary1312]
-SimTsyTestNum = 1302
-PrimaryIapId1 = 11
-PrimaryActivationErr1 = 0
-QoSEventReq1 = ENetworkQoSChange
-QoSEventReq1Idx = 0
-ExpectedNifProgress = 8000
-ExpectedNifError    = -33
-
-[PrimaryDeleteBeforeLowerNif1315]
-SimTsyTestNum = 1315
-PrimaryIapId1 = 2
-PrimaryActivationErr1 = -4
-
-[PrimaryDeleteBeforeLowerNif1316]
-SimTsyTestNum = 1316
-PrimaryIapId1 = 11
-PrimaryActivationErr1 = -4
-
-[SecondaryDeleteBeforeLowerNif1317]
-SimTsyTestNum = 1317
-PrimaryIapId1 = 11
-SecondaryActivationEvent1 = EQoSEventAddPolicy
-SecondaryActivationEvent2 = EQoSEventFailure
-SecondaryActivationEvent2Reason = -4
-SubConnectionCount1 = 0
-SubConnectionCount2 = 2
-PolicySelector = 1
-ParametersType = UmtsR99QoSAndOnTableRecord
-ParametersRecordId = 1
-
-[PrimaryLowerNifStartFails1318]
-SimTsyTestNum = 1318
-PrimaryIapId1 = 2
-PrimaryActivationErr1 = -46
-
-[PrimaryLowerNifStartFails1319]
-SimTsyTestNum = 1319
-PrimaryIapId1 = 11
-PrimaryActivationErr1 = -46
-
-[SecondaryLowerNifStartFails1320]
-SimTsyTestNum = 1320
-PrimaryIapId1 = 11
-SecondaryActivationEvent1 = EQoSEventAddPolicy
-SecondaryActivationEvent2 = EQoSEventFailure
-SecondaryActivationEvent2Reason = -46
-SubConnectionCount1 = 0
-SubConnectionCount2 = 2
-PolicySelector = 1
-ParametersType = UmtsR99QoSAndOnTableRecord
-ParametersRecordId = 1
-
-[PrimaryContextSuspendAndResume1321]
-SimTsyTestNum = 1302
-PrimaryIapId1 = 11
-PrimaryActivationErr1 = 0
-ContextType = EPrimaryContext
-LoopbackPort = PKTLOOPBACK::501
-CommRole = ECommRoleDCE
-QoSEventReq1Idx = 6
-QoSEventReq2Idx = 7
-SubConnectionCount1 = 0
-SubConnectionCount2 = 2
-PolicySelector = 1
-ParametersType = UmtsR99QoSAndOnTableRecord
-ParametersRecordId = 1
-
-[SecondaryContextSuspendAndResume1322]
-SimTsyTestNum = 1302
-PrimaryIapId1 = 11
-ContextType = ESecondaryContext
-LoopbackPort = PKTLOOPBACK::503
-CommRole = ECommRoleDCE
-SecondaryActivationEvent1 = EQoSEventAddPolicy
-SecondaryActivationEvent2 = EQoSEventConfirm
-QoSEventReq1Idx = 8
-QoSEventReq2Idx = 9
-SubConnectionCount1 = 0
-SubConnectionCount2 = 3
-PolicySelector = 1
-ParametersType = UmtsR99QoSAndOnTableRecord
-ParametersRecordId = 1
-
-[PrimaryActivationFails1323]
-SimTsyTestNum = 1323
-PrimaryIapId1 = 2
-PrimaryActivationErr1 = -19
-
-[PrimaryActivationFails1324]
-SimTsyTestNum = 1324
-PrimaryIapId1 = 11
-PrimaryActivationErr1 = -19
-
-[SecondaryActivationFails1325]
-SimTsyTestNum = 1325
-PrimaryIapId1 = 11
-SecondaryActivationEvent1 = EQoSEventAddPolicy
-SecondaryActivationEvent2 = EQoSEventFailure
-SecondaryActivationEvent2Reason = -2
-SubConnectionCount1 = 0
-SubConnectionCount2 = 2
-PolicySelector = 1
-ParametersType = UmtsR99QoSAndOnTableRecord
-ParametersRecordId = 1
-
-[SecondaryActivationFails1326]
-SimTsyTestNum = 1326
-PrimaryIapId1 = 11
-SecondaryActivationEvent1 = EQoSEventAddPolicy
-SecondaryActivationEvent2 = EQoSEventFailure
-SecondaryActivationEvent2Reason = -20
-SubConnectionCount1 = 0
-SubConnectionCount2 = 2
-PolicySelector = 1
-ParametersType = UmtsR99QoSAndOnTableRecord
-ParametersRecordId = 1
-
-[PrimaryDeletionFails1327]
-SimTsyTestNum = 1327
-PrimaryIapId1 = 2
-PrimaryActivationErr1 = 0
-
-[PrimaryDeletionFails1328]
-SimTsyTestNum = 1328
-PrimaryIapId1 = 11
-PrimaryActivationErr1 = 0
-SubConnectionCount1 = 0
-SubConnectionCount2 = 2
-PolicySelector = 1
-ParametersType = UmtsR99QoSAndOnTableRecord
-ParametersRecordId = 1
-
-[SecondaryDeletionFails1329]
-SimTsyTestNum = 1329
-PrimaryIapId1 = 11
-SecondaryActivationEvent1 = EQoSEventAddPolicy
-SecondaryActivationEvent2 = EQoSEventConfirm
-SubConnectionCount1 = 0
-SubConnectionCount2 = 2
-PolicySelector = 1
-ParametersType = UmtsR99QoSAndOnTableRecord
-ParametersRecordId = 1
-
-[PrimaryQoSEventDeleteWithSecondary1330]
-SimTsyTestNum = 1302
-IapId = 5
-PrimaryIapId1 = 11
-SecondaryActivationEvent1 = EQoSEventAddPolicy
-SecondaryActivationEvent2 = EQoSEventConfirm
-QoSEventReq1Idx = 0
-SubConnectionCount1 = 2
-SubConnectionCount2 = 3
-PolicySelector = 1
-ParametersType = UmtsR99QoSAndOnTableRecord
-ParametersRecordId = 1
-
-[PppPrimaryOk]
-SimTsyTestNum = 1
-PrimarySpudIapId = 1
-PppIapId1 = 2
-SubConnectionCount1 = 0
-SubConnectionCount2 = 2
-PolicySelector = 1
-ParametersType = UmtsR99QoSAndOnTableRecord
-ParametersRecordId = 1
-
-[PppSecondarySend]
-SimTsyTestNum = 1
-PppIapId1 = 1
-PppIapId2 = 3
-SecondaryActivationEvent1 = EQoSEventAddPolicy
-SecondaryActivationEvent2 = EQoSEventConfirm
-SubConnectionCount1 = 0
-SubConnectionCount2 = 3
-PolicySelector = 1
-ParametersType = UmtsR99QoSAndOnTableRecord
-ParametersRecordId = 1
-
-[PrimarySlowInitialisePhone1331]
-SimTsyTestNum = 1331
-PrimaryIapId1 = 2
-PrimaryActivationErr1 = -3
-
-[PrimarySlowInitialisePhone1332]
-SimTsyTestNum = 1332
-PrimaryIapId1 = 11
-PrimaryActivationErr1 = -3
-
-[MultiPrimaryActivationOk1333]
-SimTsyTestNum = 1333
-NumberOfIaps = 5
-PrimaryIapId1 = 2
-PrimaryIapId2 = 6
-PrimaryIapId3 = 7
-PrimaryIapId4 = 8
-PrimaryIapId5 = 9
-PrimaryActivationErr1 = 0
-
-[MultiPrimaryActivationOk1334]
-SimTsyTestNum = 1334
-NumberOfIaps = 5
-PrimaryIapId1 = 11
-PrimaryIapId2 = 15
-PrimaryIapId3 = 16
-PrimaryIapId4 = 17
-PrimaryIapId5 = 18
-PrimaryActivationErr1 = 0
+[ESockCheck]
+SimTsyTestNum = 0
+
+[PrimaryActivationOk1301]
+SimTsyTestNum = 1301
+PrimaryIapId1 = 2
+PrimaryActivationErr1 = 0
+SubConnectionCount1 = 0
+SubConnectionCount2 = 2
+PolicySelector = 1
+ParametersType = UmtsR99QoSAndOnTableRecord
+ParametersRecordId = 1
+
+[PrimaryActivationOk1302]
+SimTsyTestNum = 1302
+PrimaryIapId1 = 11
+PrimaryActivationErr1 = 0
+SubConnectionCount1 = 0
+SubConnectionCount2 = 2
+PolicySelector = 1
+ParametersType = UmtsR99QoSAndOnTableRecord
+ParametersRecordId = 1
+
+[SecondaryActivationOk1303]
+SimTsyTestNum = 1302
+PrimaryIapId1 = 11
+SubConnectionCount1 = 0
+SubConnectionCount2 = 2
+PolicySelector = 1
+ParametersType = UmtsR99QoSAndOnTableRecord
+ParametersRecordId = 1
+
+[PrimaryActivationFails1304]
+SimTsyTestNum = 1304
+PrimaryIapId1 = 2
+PrimaryActivationErr1 = -19
+
+[PrimaryActivationFails1305]
+SimTsyTestNum = 1305
+PrimaryIapId1 = 11
+PrimaryActivationErr1 = -19
+
+[SecondaryActivationFails1306]
+SimTsyTestNum = 1306
+PrimaryIapId1 = 11
+SecondaryActivationEvent1 = EQoSEventAddPolicy
+SecondaryActivationEvent2 = EQoSEventFailure
+SecondaryActivationEvent2Reason = -19
+SubConnectionCount1 = 0
+SubConnectionCount2 = 2
+PolicySelector = 2
+ParametersType = UmtsR99QoSAndOnTableRecord
+ParametersRecordId = 1
+
+[PrimaryQoSEventDelete1307]
+SimTsyTestNum = 1301
+PrimaryIapId1 = 2
+PrimaryActivationErr1 = 0
+QoSEventReq1 = EContextStatusChange
+QoSEventReq1Idx = 0
+ExpectedNifProgress = 8000
+ExpectedNifError    = -36
+
+[PrimaryQoSEventDelete1308]
+SimTsyTestNum = 1302
+PrimaryIapId1 = 11
+PrimaryActivationErr1 = 0
+QoSEventReq1 = EContextStatusChange
+QoSEventReq1Idx = 0
+ExpectedNifProgress = 8000
+ExpectedNifError    = -36
+
+[ENetworkQoSChangePrimary1311]
+SimTsyTestNum = 1301
+PrimaryIapId1 = 2
+PrimaryActivationErr1 = 0
+QoSEventReq1 = ENetworkQoSChange
+QoSEventReq1Idx = 0
+ExpectedNifProgress = 8000
+ExpectedNifError    = -33
+
+[ENetworkQoSChangePrimary1312]
+SimTsyTestNum = 1302
+PrimaryIapId1 = 11
+PrimaryActivationErr1 = 0
+QoSEventReq1 = ENetworkQoSChange
+QoSEventReq1Idx = 0
+ExpectedNifProgress = 8000
+ExpectedNifError    = -33
+
+[PrimaryDeleteBeforeLowerNif1315]
+SimTsyTestNum = 1315
+PrimaryIapId1 = 2
+PrimaryActivationErr1 = -4
+
+[PrimaryDeleteBeforeLowerNif1316]
+SimTsyTestNum = 1316
+PrimaryIapId1 = 11
+PrimaryActivationErr1 = -4
+
+[SecondaryDeleteBeforeLowerNif1317]
+SimTsyTestNum = 1317
+PrimaryIapId1 = 11
+SecondaryActivationEvent1 = EQoSEventAddPolicy
+SecondaryActivationEvent2 = EQoSEventFailure
+SecondaryActivationEvent2Reason = -4
+SubConnectionCount1 = 0
+SubConnectionCount2 = 2
+PolicySelector = 1
+ParametersType = UmtsR99QoSAndOnTableRecord
+ParametersRecordId = 1
+
+[PrimaryLowerNifStartFails1318]
+SimTsyTestNum = 1318
+PrimaryIapId1 = 2
+PrimaryActivationErr1 = -46
+
+[PrimaryLowerNifStartFails1319]
+SimTsyTestNum = 1319
+PrimaryIapId1 = 11
+PrimaryActivationErr1 = -46
+
+[SecondaryLowerNifStartFails1320]
+SimTsyTestNum = 1320
+PrimaryIapId1 = 11
+SecondaryActivationEvent1 = EQoSEventAddPolicy
+SecondaryActivationEvent2 = EQoSEventFailure
+SecondaryActivationEvent2Reason = -46
+SubConnectionCount1 = 0
+SubConnectionCount2 = 2
+PolicySelector = 1
+ParametersType = UmtsR99QoSAndOnTableRecord
+ParametersRecordId = 1
+
+[PrimaryContextSuspendAndResume1321]
+SimTsyTestNum = 1302
+PrimaryIapId1 = 11
+PrimaryActivationErr1 = 0
+ContextType = EPrimaryContext
+LoopbackPort = PKTLOOPBACK::501
+CommRole = ECommRoleDCE
+QoSEventReq1Idx = 6
+QoSEventReq2Idx = 7
+SubConnectionCount1 = 0
+SubConnectionCount2 = 2
+PolicySelector = 1
+ParametersType = UmtsR99QoSAndOnTableRecord
+ParametersRecordId = 1
+
+[SecondaryContextSuspendAndResume1322]
+SimTsyTestNum = 1302
+PrimaryIapId1 = 11
+ContextType = ESecondaryContext
+LoopbackPort = PKTLOOPBACK::503
+CommRole = ECommRoleDCE
+SecondaryActivationEvent1 = EQoSEventAddPolicy
+SecondaryActivationEvent2 = EQoSEventConfirm
+QoSEventReq1Idx = 8
+QoSEventReq2Idx = 9
+SubConnectionCount1 = 0
+SubConnectionCount2 = 3
+PolicySelector = 1
+ParametersType = UmtsR99QoSAndOnTableRecord
+ParametersRecordId = 1
+
+[PrimaryActivationFails1323]
+SimTsyTestNum = 1323
+PrimaryIapId1 = 2
+PrimaryActivationErr1 = -19
+
+[PrimaryActivationFails1324]
+SimTsyTestNum = 1324
+PrimaryIapId1 = 11
+PrimaryActivationErr1 = -19
+
+[SecondaryActivationFails1325]
+SimTsyTestNum = 1325
+PrimaryIapId1 = 11
+SecondaryActivationEvent1 = EQoSEventAddPolicy
+SecondaryActivationEvent2 = EQoSEventFailure
+SecondaryActivationEvent2Reason = -2
+SubConnectionCount1 = 0
+SubConnectionCount2 = 2
+PolicySelector = 1
+ParametersType = UmtsR99QoSAndOnTableRecord
+ParametersRecordId = 1
+
+[SecondaryActivationFails1326]
+SimTsyTestNum = 1326
+PrimaryIapId1 = 11
+SecondaryActivationEvent1 = EQoSEventAddPolicy
+SecondaryActivationEvent2 = EQoSEventFailure
+SecondaryActivationEvent2Reason = -20
+SubConnectionCount1 = 0
+SubConnectionCount2 = 2
+PolicySelector = 1
+ParametersType = UmtsR99QoSAndOnTableRecord
+ParametersRecordId = 1
+
+[PrimaryDeletionFails1327]
+SimTsyTestNum = 1327
+PrimaryIapId1 = 2
+PrimaryActivationErr1 = 0
+
+[PrimaryDeletionFails1328]
+SimTsyTestNum = 1328
+PrimaryIapId1 = 11
+PrimaryActivationErr1 = 0
+SubConnectionCount1 = 0
+SubConnectionCount2 = 2
+PolicySelector = 1
+ParametersType = UmtsR99QoSAndOnTableRecord
+ParametersRecordId = 1
+
+[SecondaryDeletionFails1329]
+SimTsyTestNum = 1329
+PrimaryIapId1 = 11
+SecondaryActivationEvent1 = EQoSEventAddPolicy
+SecondaryActivationEvent2 = EQoSEventConfirm
+SubConnectionCount1 = 0
+SubConnectionCount2 = 2
+PolicySelector = 1
+ParametersType = UmtsR99QoSAndOnTableRecord
+ParametersRecordId = 1
+
+[PrimaryQoSEventDeleteWithSecondary1330]
+SimTsyTestNum = 1302
+IapId = 5
+PrimaryIapId1 = 11
+SecondaryActivationEvent1 = EQoSEventAddPolicy
+SecondaryActivationEvent2 = EQoSEventConfirm
+QoSEventReq1Idx = 0
+SubConnectionCount1 = 2
+SubConnectionCount2 = 3
+PolicySelector = 1
+ParametersType = UmtsR99QoSAndOnTableRecord
+ParametersRecordId = 1
+
+[PppPrimaryOk]
+SimTsyTestNum = 1
+PrimarySpudIapId = 1
+PppIapId1 = 2
+SubConnectionCount1 = 0
+SubConnectionCount2 = 2
+PolicySelector = 1
+ParametersType = UmtsR99QoSAndOnTableRecord
+ParametersRecordId = 1
+
+[PppSecondarySend]
+SimTsyTestNum = 1
+PppIapId1 = 1
+PppIapId2 = 3
+SecondaryActivationEvent1 = EQoSEventAddPolicy
+SecondaryActivationEvent2 = EQoSEventConfirm
+SubConnectionCount1 = 0
+SubConnectionCount2 = 3
+PolicySelector = 1
+ParametersType = UmtsR99QoSAndOnTableRecord
+ParametersRecordId = 1
+
+[PrimarySlowInitialisePhone1331]
+SimTsyTestNum = 1331
+PrimaryIapId1 = 2
+PrimaryActivationErr1 = -3
+
+[PrimarySlowInitialisePhone1332]
+SimTsyTestNum = 1332
+PrimaryIapId1 = 11
+PrimaryActivationErr1 = -3
+
+[MultiPrimaryActivationOk1333]
+SimTsyTestNum = 1333
+NumberOfIaps = 5
+PrimaryIapId1 = 2
+PrimaryIapId2 = 6
+PrimaryIapId3 = 7
+PrimaryIapId4 = 8
+PrimaryIapId5 = 9
+PrimaryActivationErr1 = 0
+
+[MultiPrimaryActivationOk1334]
+SimTsyTestNum = 1334
+NumberOfIaps = 5
+PrimaryIapId1 = 11
+PrimaryIapId2 = 15
+PrimaryIapId3 = 16
+PrimaryIapId4 = 17
+PrimaryIapId5 = 18
+PrimaryActivationErr1 = 0