diff -r 96612d01cf9f -r 6711b85517b7 videofeeds/server/tsrc/VCXVodContentApiTest/conf/VCXVodContentApiTestCategoriesR3.cfg --- a/videofeeds/server/tsrc/VCXVodContentApiTest/conf/VCXVodContentApiTestCategoriesR3.cfg Mon Jan 18 20:21:12 2010 +0200 +++ b/videofeeds/server/tsrc/VCXVodContentApiTest/conf/VCXVodContentApiTestCategoriesR3.cfg Tue Jan 26 12:00:59 2010 +0200 @@ -32,6 +32,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 @@ -41,38 +42,47 @@ ServUtil AddHardCodedService ASYNC SERVICE_9 3G_AP 1 10 // OOPS9 ServUtil UpdateServiceField ASYNC SERVICE_9 EAddress "http:\/\/193.65.182.78/nseries.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/nseries_cat.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 // OOPS9 ServUtil UpdateServiceField ASYNC SERVICE_9 EAddress "http:\/\/193.65.182.78/nseries_cat_unorganised.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 // OOPS9 ServUtil UpdateServiceField ASYNC SERVICE_9 EAddress "http:\/\/193.65.182.78/nseries_cat_and_channels.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 // OOPS9 ServUtil UpdateServiceField ASYNC SERVICE_9 EAddress "http:\/\/193.65.182.78/nseries_1st_channel_with_cat.xml" +ServUtil UpdateServiceField ASYNC SERVICE_9 ESetIapList WLAN_AP 1 3G_AP 1 ServUtil UpdateServiceField ASYNC SERVICE_9 EName EXTRA_SERVICE_5 ServUtil AddHardCodedService ASYNC SERVICE_9 3G_AP 1 10 // OOPS9 ServUtil UpdateServiceField ASYNC SERVICE_9 EAddress "http:\/\/193.65.182.78/nseries_2nd_channel_with_cat.xml" +ServUtil UpdateServiceField ASYNC SERVICE_9 ESetIapList WLAN_AP 1 3G_AP 1 ServUtil UpdateServiceField ASYNC SERVICE_9 EName EXTRA_SERVICE_6 ServUtil AddHardCodedService ASYNC SERVICE_9 3G_AP 1 10 // OOPS9 ServUtil UpdateServiceField ASYNC SERVICE_9 EAddress "http:\/\/193.65.182.78/nseries_20cat.xml" +ServUtil UpdateServiceField ASYNC SERVICE_9 ESetIapList WLAN_AP 1 3G_AP 1 ServUtil UpdateServiceField ASYNC SERVICE_9 EName EXTRA_SERVICE_7 ServUtil AddHardCodedService ASYNC SERVICE_9 3G_AP 1 10 // OOPS9 ServUtil UpdateServiceField ASYNC SERVICE_9 EAddress "http:\/\/193.65.182.78/nseries_20cat_and_3channels.xml" +ServUtil UpdateServiceField ASYNC SERVICE_9 ESetIapList WLAN_AP 1 3G_AP 1 ServUtil UpdateServiceField ASYNC SERVICE_9 EName EXTRA_SERVICE_8 ServUtil AddHardCodedService ASYNC SERVICE_9 3G_AP 1 10 // OOPS9 ServUtil UpdateServiceField ASYNC SERVICE_9 EAddress "http:\/\/193.65.182.78/nseries_21cat.xml" +ServUtil UpdateServiceField ASYNC SERVICE_9 ESetIapList WLAN_AP 1 3G_AP 1 ServUtil UpdateServiceField ASYNC SERVICE_9 EName EXTRA_SERVICE_9 ServUtil GetServices SYNC 0 250 @@ -97,7 +107,7 @@ test EnableThumbnails test DeleteEpgDb test Create EXTRA_SERVICE_1 -test SelectIap 3G_AP +test SelectIap DEFAULT_AP test UpdateEcg waittestclass test test EnableVerifying ET11901 @@ -124,7 +134,7 @@ test EnableThumbnails test DeleteEpgDb test Create EXTRA_SERVICE_2 -test SelectIap 3G_AP +test SelectIap DEFAULT_AP test UpdateEcg waittestclass test test EnableVerifying ET11902 @@ -151,7 +161,7 @@ test EnableThumbnails test DeleteEpgDb test Create EXTRA_SERVICE_3 -test SelectIap 3G_AP +test SelectIap DEFAULT_AP test UpdateEcg waittestclass test test EnableVerifying ET11903 @@ -178,7 +188,7 @@ test EnableThumbnails test DeleteEpgDb test Create EXTRA_SERVICE_4 -test SelectIap 3G_AP +test SelectIap DEFAULT_AP test UpdateEcg waittestclass test test EnableVerifying ET11904 @@ -204,7 +214,7 @@ test EnableThumbnails test DeleteEpgDb test Create EXTRA_SERVICE_5 -test SelectIap 3G_AP +test SelectIap DEFAULT_AP test UpdateEcg waittestclass test test EnableVerifying ET11905 @@ -230,7 +240,7 @@ test EnableThumbnails test DeleteEpgDb test Create EXTRA_SERVICE_6 -test SelectIap 3G_AP +test SelectIap DEFAULT_AP test UpdateEcg waittestclass test test EnableVerifying ET11906 @@ -256,7 +266,7 @@ test EnableThumbnails test DeleteEpgDb test Create EXTRA_SERVICE_7 -test SelectIap 3G_AP +test SelectIap DEFAULT_AP test UpdateEcg waittestclass test test EnableVerifying ET11907 @@ -282,7 +292,7 @@ test EnableThumbnails test DeleteEpgDb test Create EXTRA_SERVICE_8 -test SelectIap 3G_AP +test SelectIap DEFAULT_AP test UpdateEcg waittestclass test test EnableVerifying ET11908 @@ -308,7 +318,7 @@ test EnableThumbnails test DeleteEpgDb test Create EXTRA_SERVICE_9 -test SelectIap 3G_AP +test SelectIap DEFAULT_AP test UpdateEcg waittestclass test test EnableVerifying ET11909 @@ -344,7 +354,7 @@ create VCXVodContentApiTest test test SetParentalControlAge 0 test Create EXTRA_SERVICE_5 -test SelectIap 3G_AP +test SelectIap DEFAULT_AP test UpdateEcg waittestclass test @@ -381,7 +391,7 @@ create VCXVodContentApiTest test test SetParentalControlAge 0 test Create EXTRA_SERVICE_5 -test SelectIap 3G_AP +test SelectIap DEFAULT_AP test UpdateEcg waittestclass test @@ -419,7 +429,7 @@ test SetParentalControlAge 0 test DisableThumbnails test Create EXTRA_SERVICE_5 10 -test SelectIap 3G_AP +test SelectIap DEFAULT_AP test UpdateEcg waittestclass test @@ -457,7 +467,7 @@ test DisableThumbnails test SetParentalControlAge 0 test Create EXTRA_SERVICE_5 10 -test SelectIap 3G_AP +test SelectIap DEFAULT_AP test UpdateEcg waittestclass test @@ -495,7 +505,7 @@ test SetParentalControlAge 0 test DisableThumbnails test Create EXTRA_SERVICE_5 -test SelectIap 3G_AP +test SelectIap DEFAULT_AP test UpdateEcg waittestclass test @@ -533,7 +543,7 @@ test SetParentalControlAge 0 test DisableThumbnails test Create EXTRA_SERVICE_5 10 -test SelectIap 3G_AP +test SelectIap DEFAULT_AP test UpdateEcg waittestclass test @@ -571,7 +581,7 @@ test SetParentalControlAge 0 test DisableThumbnails test Create EXTRA_SERVICE_5 10 -test SelectIap 3G_AP +test SelectIap DEFAULT_AP test UpdateEcg waittestclass test