diff -r 9d7ce34704c8 -r b564fb5fd78b datacommsserver/esockserver/test/TE_RConnectionSuite/config/ainethernet_MOMAP16xx.xml
--- a/datacommsserver/esockserver/test/TE_RConnectionSuite/config/ainethernet_MOMAP16xx.xml	Tue Aug 31 16:25:36 2010 +0300
+++ b/datacommsserver/esockserver/test/TE_RConnectionSuite/config/ainethernet_MOMAP16xx.xml	Wed Sep 01 12:35:48 2010 +0100
@@ -30,10 +30,10 @@
 
 <NetworkTable>
     <Network operation="add">
-        <Name>Intranet</Name>
+        <Name>NT RAS</Name>
     </Network>
     <Network operation="add">
-        <Name>NT RAS</Name>
+        <Name>Intranet</Name>
     </Network>
     <Network operation="add">
         <Name>Linux</Name>
@@ -64,12 +64,12 @@
         <LocationRef>Location.Mobile</LocationRef>
     </IAP>
     <IAP operation="add">
-        <Name>Additional Dial In ISP</Name>
-        <IAPService>DialInISP.Dial In CS ISP</IAPService>
-        <IAPBearer>ModemBearer.Linux</IAPBearer>
+        <Name>iTest name cdma2000</Name>
+        <IAPService>CDMA2000PacketService.test name cdma2000</IAPService>
+        <IAPBearer>ModemBearer.Dummy 2</IAPBearer>
         <IAPNetwork>Network.NT RAS</IAPNetwork>
         <IAPNetworkWeighting>0</IAPNetworkWeighting>
-        <LocationRef>Location.Home</LocationRef>
+        <LocationRef>Location.Mobile</LocationRef>
     </IAP>
     <IAP operation="add">
         <Name>Default Dial In ISP</Name>
@@ -96,12 +96,12 @@
         <LocationRef>Location.Office Direct Dial</LocationRef>
     </IAP>
     <IAP operation="add">
-		<Name>WlanConnectivity</Name>
-		<IAPService>LANService.WlanConnectivity</IAPService>
-       <IAPBearer>LANBearer.WLANBearer</IAPBearer>
-		<IAPNetwork>Network.Intranet</IAPNetwork>
-		<IAPNetworkWeighting>0</IAPNetworkWeighting>
-		<LocationRef>Location.Office Direct Dial</LocationRef>
+        <Name>Ethernet with Daemon Dynamic IP</Name>
+        <IAPService>LANService.Ethernet</IAPService>
+        <IAPBearer>LANBearer.EKA2 Ethernet</IAPBearer>
+        <IAPNetwork>Network.Intranet</IAPNetwork>
+        <IAPNetworkWeighting>0</IAPNetworkWeighting>
+        <LocationRef>Location.Office</LocationRef>
     </IAP>
     <IAP operation="add">
         <Name>Virtual Comm port</Name>
@@ -156,8 +156,8 @@
         <IAPService>DialOutISP.Dummy</IAPService>
         <IAPBearer>ModemBearer.Dummy</IAPBearer>
         <IAPNetwork>Network.Dummy</IAPNetwork>
-		<IAPNetworkWeighting>0</IAPNetworkWeighting>
-		<LocationRef>Location.Office Direct Dial</LocationRef>
+        <IAPNetworkWeighting>0</IAPNetworkWeighting>
+        <LocationRef>Location.Office Direct Dial</LocationRef>
     </IAP>
 </IAPTable>
 
@@ -638,34 +638,33 @@
 
 <LANBearerTable>
     <LANBearer operation="add">
-		<Name>WLANBearer</Name>
-		<IfName>wlannif</IfName>
-		<LDDName>not used</LDDName>
-		<PDDName>not used</PDDName>
-		<LastSocketActivityTimeout>10</LastSocketActivityTimeout>
-		<LastSessionClosedTimeout>10</LastSessionClosedTimeout>
-		<LastSocketClosedTimeout>10</LastSocketClosedTimeout>
-		<Agent>wlanagt.agt</Agent>
+	<Name>EKA2 Ethernet</Name>
+	<Agent>nullagt.agt</Agent>
+	<IfName>ethint</IfName>
+	<LDDFilename>enet</LDDFilename>
+	<LDDName>Ethernet</LDDName>
+	<PDDFilename>ethernet</PDDFilename>
+	<PDDName>Ethernet.MOMAP16xx</PDDName>
+	<PacketDriverName>EtherPkt.drv</PacketDriverName>
+	<LastSocketActivityTimeout>10</LastSocketActivityTimeout>
+	<LastSessionClosedTimeout>10</LastSessionClosedTimeout>
+	<LastSocketClosedTimeout>10</LastSocketClosedTimeout>
     </LANBearer>
 </LANBearerTable>
 
 <LANServiceTable>
     <LANService operation="add">
-		<Name>WlanConnectivity</Name>
-		<IfNetworks>ip</IfNetworks>
-		<IpNetMask>255.255.255.0</IpNetMask>
-		<IpGateway>0.0.0.0</IpGateway>
-		<IpAddrFromServer>TRUE</IpAddrFromServer>
-		<IpAddr>0.0.0.0</IpAddr>
-		<IpDNSAddrFromServer>TRUE</IpDNSAddrFromServer>
-		<IpNameServer1>0.0.0.0</IpNameServer1>
-		<IpNameServer2>0.0.0.0</IpNameServer2>
-		<Ip6DnsAddrFromServer>TRUE</Ip6DnsAddrFromServer>
-		<Ip6NameServer1>0:0:0:0:0:0:0:0</Ip6NameServer1>
-		<Ip6NameServer2>0:0:0:0:0:0:0:0</Ip6NameServer2>
-		<IpAddrLeaseValidFrom>0</IpAddrLeaseValidFrom>
-		<ConfigDaemonManagerName>NetCfgExtnDhcp</ConfigDaemonManagerName>
-		<ConfigDaemonName>!DhcpServ</ConfigDaemonName>
+        <Name>Ethernet</Name>
+        <IfNetworks>ip</IfNetworks>
+        <IpNetMask>255.255.255.0</IpNetMask>
+        <IpGateway>10.23.143.254</IpGateway>
+        <IpAddr></IpAddr>
+        <IpAddrFromServer>TRUE</IpAddrFromServer>
+        <IpDNSAddrFromServer>TRUE</IpDNSAddrFromServer>
+        <IpNameServer1>10.16.59.15</IpNameServer1>
+        <IpNameServer2>10.112.58.6</IpNameServer2>
+        <ConfigDaemonManagerName>NetCfgExtnDhcp</ConfigDaemonManagerName>
+        <ConfigDaemonName>!DhcpServ</ConfigDaemonName>
     </LANService>
 </LANServiceTable>
 
@@ -864,6 +863,49 @@
 <AgentLookupTable>
 </AgentLookupTable>
 
+<CDMA2000PacketServiceTable>
+    <CDMA2000PacketService operation="add">
+        <Name>test name cdma2000</Name>
+        <IwfName>Test2000</IwfName>
+        <ServiceOption>HIGHSPEEDCDMA2000DATA</ServiceOption>
+        <PdpType>IPV4</PdpType>
+        <ReqFwdPriority>PRIORITY04</ReqFwdPriority>
+        <ReqRevPriority>PRIORITY04</ReqRevPriority>
+        <ReqFwdBitrate>32KBPS</ReqFwdBitrate>
+        <ReqRevBitrate>32KBPS</ReqRevBitrate>
+        <ReqFwdLoss>LOSS1</ReqFwdLoss>
+        <ReqRevLoss>LOSS1</ReqRevLoss>
+        <ReqFwdMaxdelay>40MS</ReqFwdMaxdelay>
+        <ReqRevMaxdelay>40MS</ReqRevMaxdelay>
+        <MinFwdBitrate>8KBPS</MinFwdBitrate>
+        <MinRevBitrate>8KBPS</MinRevBitrate>
+        <AccptFwdLoss>LOSS2</AccptFwdLoss>
+        <AccptRevLoss>LOSS2</AccptRevLoss>
+        <AccptFwdMaxdelay>120MS</AccptFwdMaxdelay>
+        <AccptRevMaxdelay>120MS</AccptRevMaxdelay>
+        <DataCompression>FALSE</DataCompression>
+        <HeaderCompression>FALSE</HeaderCompression>
+        <AnonymousAccess>FALSE</AnonymousAccess>
+        <IfNetworks>ip</IfNetworks>
+        <IfAuthName>RasUser</IfAuthName>
+        <IfAuthPass>pass</IfAuthPass>
+        <AuthRetries>1</AuthRetries>
+        <IpNetMask>0.255.255.255</IpNetMask>
+        <IpGateway>10.0.0.1</IpGateway>
+        <EnableLCPExtension>TRUE</EnableLCPExtension>
+        <DisablePlainTextAuth>TRUE</DisablePlainTextAuth>
+        <ApType>2</ApType>
+        <IfPromptForAuth>FALSE</IfPromptForAuth>
+        <IpAddrFromServer>TRUE</IpAddrFromServer>
+        <IpDNSAddrFromServer>TRUE</IpDNSAddrFromServer>
+        <RlpMode>UNKNOWN</RlpMode>
+        <CDMAMobileIP>FALSE</CDMAMobileIP>
+        <CDMAMobileIPTimeout>10000000</CDMAMobileIPTimeout>
+    </CDMA2000PacketService>
+</CDMA2000PacketServiceTable>
+
+<DefaultCDMA2000Table>
+</DefaultCDMA2000Table>
 
 <ChargecardTable>
     <Chargecard operation="add">
@@ -899,7 +941,7 @@
         <Direction>OUTGOING</Direction>
         <DialogPref>DONOTPROMPT</DialogPref>
         <BearerSet>LAN</BearerSet>
-        <IAPRef>IAP.WlanConnectivity</IAPRef>
+        <IAPRef>IAP.Ethernet with Daemon Dynamic IP</IAPRef>
     </ConnectionPreferences>
 </ConnectionPreferencesTable>