diff -r 96612d01cf9f -r 6711b85517b7 videofeeds/server/tsrc/VCXVodContentApiTest/conf/VCXVodContentApiTestInterference.cfg
--- a/videofeeds/server/tsrc/VCXVodContentApiTest/conf/VCXVodContentApiTestInterference.cfg	Mon Jan 18 20:21:12 2010 +0200
+++ b/videofeeds/server/tsrc/VCXVodContentApiTest/conf/VCXVodContentApiTestInterference.cfg	Tue Jan 26 12:00:59 2010 +0200
@@ -31,6 +31,7 @@
 Util SetUsedDestination DEFAULT_DEST
 // Disable connection dialog for "Internet" destination.
 Util SetConnectionMethodIntAttribute "Internet" "Internet" 507 2 // 507 is ECmSeamlessnessLevel
+Util SetDefaultIapCenrep
 delete Util
 
 pause PAUSE
@@ -53,22 +54,27 @@
 
 ServUtil AddHardCodedService 	ASYNC SERVICE_9	 	3G_AP 1 10 	// OOPS9
 ServUtil UpdateServiceField		ASYNC SERVICE_9 	EAddress 	"http:\/\/193.65.182.78/multiurl.xml"
+ServUtil UpdateServiceField 	ASYNC	SERVICE_9		ESetIapList WLAN_AP 1 3G_AP 1
 ServUtil UpdateServiceField		ASYNC SERVICE_9 	EName 	EXTRA_SERVICE_1
 
 ServUtil AddHardCodedService 	ASYNC SERVICE_9	 	3G_AP 1 10 	// OOPS9
 ServUtil UpdateServiceField		ASYNC SERVICE_9 	EAddress 	"http:\/\/193.65.182.78/mimetype_tests/allmimetypes.xml"
+ServUtil UpdateServiceField 	ASYNC	SERVICE_9		ESetIapList WLAN_AP 1 3G_AP 1
 ServUtil UpdateServiceField		ASYNC SERVICE_9 	EName 	EXTRA_SERVICE_2
 
 ServUtil AddHardCodedService 	ASYNC SERVICE_9	 	3G_AP 1 10
 ServUtil UpdateServiceField		ASYNC SERVICE_9 	EAddress 	"http:\/\/193.65.182.78/preview.xml"
+ServUtil UpdateServiceField 	ASYNC	SERVICE_9		ESetIapList WLAN_AP 1 3G_AP 1
 ServUtil UpdateServiceField		ASYNC SERVICE_9 	EName 	EXTRA_SERVICE_3
 
 ServUtil AddHardCodedService 	ASYNC SERVICE_9	 	3G_AP 1 10
 ServUtil UpdateServiceField		ASYNC SERVICE_9 	EAddress 	"http:\/\/193.65.182.78/ecg_parental_control.xml"
+ServUtil UpdateServiceField 	ASYNC	SERVICE_9		ESetIapList WLAN_AP 1 3G_AP 1
 ServUtil UpdateServiceField		ASYNC SERVICE_9 	EName 	EXTRA_SERVICE_4
 
 ServUtil AddHardCodedService 	ASYNC SERVICE_9	 	3G_AP 1 10
 ServUtil UpdateServiceField		ASYNC SERVICE_9 	EAddress 	"http:\/\/193.65.182.78/dvbtest/xmltv/xmltv_1day.xml"
+ServUtil UpdateServiceField 	ASYNC	SERVICE_9		ESetIapList WLAN_AP 1 3G_AP 1
 ServUtil UpdateServiceField		ASYNC SERVICE_9 	EName 	EXTRA_SERVICE_5
 
 ServUtil GetServices SYNC 0 250
@@ -93,7 +99,7 @@
 test DeleteEpgDb
 test Create SERVICE_0
 testinterference interference1 start thread cpuload 250 2000
-test SelectIap 3G_AP
+test SelectIap DEFAULT_AP
 test UpdateEcg
 waittestclass test
 testinterference interference1 stop
@@ -117,7 +123,7 @@
 test EnableThumbnails
 test DeleteEpgDb
 test Create SERVICE_0
-test SelectIap 3G_AP
+test SelectIap DEFAULT_AP
 test UpdateEcg
 waittestclass test
 test Destroy
@@ -139,7 +145,7 @@
 create VCXVodContentApiTest test
 test Create SERVICE_0
 testinterference interference1 start thread cpuload 250 2000
-test SelectIap 3G_AP
+test SelectIap DEFAULT_AP
 test GetEcgList 1 "" 0 10
 testinterference interference1 stop
 test Destroy
@@ -161,7 +167,7 @@
 create VCXVodContentApiTest test
 test Create SERVICE_0
 testinterference interference1 start thread cpuload 250 2000
-test SelectIap 3G_AP
+test SelectIap DEFAULT_AP
 test EcgCategoryList 0
 testinterference interference1 stop
 test Destroy
@@ -183,7 +189,7 @@
 create VCXVodContentApiTest test
 test Create SERVICE_0
 testinterference interference1 start thread cpuload 250 2000
-test SelectIap 3G_AP
+test SelectIap DEFAULT_AP
 test EcgEcgAllList "" 0 5
 testinterference interference1 stop
 test Destroy
@@ -205,7 +211,7 @@
 create VCXVodContentApiTest test
 test Create SERVICE_0
 testinterference interference1 start thread cpuload 250 2000
-test SelectIap 3G_AP
+test SelectIap DEFAULT_AP
 test CategoryDetails 1
 testinterference interference1 stop
 test Destroy
@@ -227,7 +233,7 @@
 create VCXVodContentApiTest test
 test Create SERVICE_0
 testinterference interference1 start thread cpuload 250 2000
-test SelectIap 3G_AP
+test SelectIap DEFAULT_AP
 test ParentCategory 0
 testinterference interference1 stop
 test Destroy
@@ -249,7 +255,7 @@
 create VCXVodContentApiTest test
 test Create SERVICE_0
 testinterference interference1 start thread cpuload 250 2000
-test SelectIap 3G_AP
+test SelectIap DEFAULT_AP
 test ContentDetailsList 0
 testinterference interference1 stop
 test Destroy
@@ -292,7 +298,7 @@
 pause PAUSE
 create VCXVodContentApiTest test
 test Create SERVICE_10
-test SelectIap 3G_AP
+test SelectIap DEFAULT_AP
 test UpdateEcg
 waittestclass test
 test Destroy
@@ -314,7 +320,7 @@
 create VCXVodContentApiTest test
 test Create SERVICE_10
 testinterference interference1 start thread cpuload 250 2000
-test SelectIap 3G_AP
+test SelectIap DEFAULT_AP
 test GetEcgList 1 "Amazing Spaces - Adam" 0 10
 test GetEcgList 3 "Nokia B" 0 10
 test GetEcgList 5 "Wedding" 0 10
@@ -338,7 +344,7 @@
 create VCXVodContentApiTest test
 test Create SERVICE_10
 testinterference interference1 start thread cpuload 250 2000
-test SelectIap 3G_AP
+test SelectIap DEFAULT_AP
 test EcgCategoryList 0
 testinterference interference1 stop
 test Destroy
@@ -360,7 +366,7 @@
 create VCXVodContentApiTest test
 test Create SERVICE_10
 testinterference interference1 start thread cpuload 250 2000
-test SelectIap 3G_AP
+test SelectIap DEFAULT_AP
 test ContentDetailsList 0
 testinterference interference1 stop
 test Destroy
@@ -384,7 +390,7 @@
 test DeleteEpgDb
 test Create SERVICE_0
 testinterference interference1 start activeobject cpuload 500 1000
-test SelectIap 3G_AP
+test SelectIap DEFAULT_AP
 test UpdateEcg
 waittestclass test
 testinterference interference1 stop
@@ -408,7 +414,7 @@
 test EnableThumbnails
 test DeleteEpgDb
 test Create SERVICE_0
-test SelectIap 3G_AP
+test SelectIap DEFAULT_AP
 test UpdateEcg
 waittestclass test
 test Destroy
@@ -430,7 +436,7 @@
 create VCXVodContentApiTest test
 test Create SERVICE_0
 testinterference interference1 start activeobject cpuload 500 1000
-test SelectIap 3G_AP
+test SelectIap DEFAULT_AP
 test GetEcgList 1 "" 0 10
 testinterference interference1 stop
 test Destroy
@@ -452,7 +458,7 @@
 create VCXVodContentApiTest test
 test Create SERVICE_0
 testinterference interference1 start activeobject cpuload 500 1000
-test SelectIap 3G_AP
+test SelectIap DEFAULT_AP
 test EcgCategoryList 0
 testinterference interference1 stop
 test Destroy
@@ -474,7 +480,7 @@
 create VCXVodContentApiTest test
 test Create SERVICE_0
 testinterference interference1 start activeobject cpuload 500 1000
-test SelectIap 3G_AP
+test SelectIap DEFAULT_AP
 test EcgEcgAllList "" 0 5
 testinterference interference1 stop
 test Destroy
@@ -496,7 +502,7 @@
 create VCXVodContentApiTest test
 test Create SERVICE_0
 testinterference interference1 start activeobject cpuload 500 1000
-test SelectIap 3G_AP
+test SelectIap DEFAULT_AP
 test CategoryDetails 1
 testinterference interference1 stop
 test Destroy
@@ -518,7 +524,7 @@
 create VCXVodContentApiTest test
 test Create SERVICE_0
 testinterference interference1 start activeobject cpuload 500 1000
-test SelectIap 3G_AP
+test SelectIap DEFAULT_AP
 test ParentCategory 0
 testinterference interference1 stop
 test Destroy
@@ -540,7 +546,7 @@
 create VCXVodContentApiTest test
 test Create SERVICE_0
 testinterference interference1 start activeobject cpuload 500 1000
-test SelectIap 3G_AP
+test SelectIap DEFAULT_AP
 test ContentDetailsList 0
 testinterference interference1 stop
 test Destroy
@@ -583,7 +589,7 @@
 pause PAUSE
 create VCXVodContentApiTest test
 test Create SERVICE_10
-test SelectIap 3G_AP
+test SelectIap DEFAULT_AP
 test UpdateEcg
 waittestclass test
 test Destroy
@@ -605,7 +611,7 @@
 create VCXVodContentApiTest test
 test Create SERVICE_10
 testinterference interference1 start activeobject cpuload 500 1000
-test SelectIap 3G_AP
+test SelectIap DEFAULT_AP
 test GetEcgList 1 "Amazing Spaces - Adam" 0 10
 test GetEcgList 3 "Nokia B" 0 10
 test GetEcgList 5 "Wedding" 0 10
@@ -629,7 +635,7 @@
 create VCXVodContentApiTest test
 test Create SERVICE_10
 testinterference interference1 start activeobject cpuload 500 1000
-test SelectIap 3G_AP
+test SelectIap DEFAULT_AP
 test EcgCategoryList 0
 testinterference interference1 stop
 test Destroy
@@ -651,7 +657,7 @@
 create VCXVodContentApiTest test
 test Create SERVICE_10
 testinterference interference1 start activeobject cpuload 500 1000
-test SelectIap 3G_AP
+test SelectIap DEFAULT_AP
 test ContentDetailsList 0
 testinterference interference1 stop
 test Destroy
@@ -675,7 +681,7 @@
 test DeleteEpgDb
 test Create SERVICE_0
 testinterference interference1 start thread filesystemwritec 250 2000
-test SelectIap 3G_AP
+test SelectIap DEFAULT_AP
 test UpdateEcg
 waittestclass test
 testinterference interference1 stop
@@ -700,7 +706,7 @@
 test DeleteEpgDb
 test Create SERVICE_0
 testinterference interference1 start thread filesystemreadc 250 2000
-test SelectIap 3G_AP
+test SelectIap DEFAULT_AP
 test UpdateEcg
 waittestclass test
 testinterference interference1 stop
@@ -725,7 +731,7 @@
 test DeleteEpgDb
 test Create SERVICE_0
 testinterference interference1 start activeobject filesystemwritec 250 2000
-test SelectIap 3G_AP
+test SelectIap DEFAULT_AP
 test UpdateEcg
 waittestclass test
 testinterference interference1 stop
@@ -750,7 +756,7 @@
 test DeleteEpgDb
 test Create SERVICE_0
 testinterference interference1 start activeobject filesystemreadc 250 2000
-test SelectIap 3G_AP
+test SelectIap DEFAULT_AP
 test UpdateEcg
 waittestclass test
 testinterference interference1 stop