Add test for propagation loss and fix bugs

This commit is contained in:
Tim Schubert 2020-08-11 18:14:43 +02:00
parent 090ef28e99
commit 2f94c15455
3 changed files with 121 additions and 14 deletions

View file

@ -78,7 +78,6 @@ LeoTestCase1::DoRun (void)
islCh.SetDeviceAttribute ("ReceiveErrorModel", StringValue ("ns3::BurstErrorModel"));
islCh.SetChannelAttribute ("PropagationDelay", StringValue ("ns3::ConstantSpeedPropagationDelayModel"));
islCh.SetDeviceAttribute ("InterframeGap", TimeValue (Seconds (0.001)));
//// TODO propagation loss from mobility model
islCh.SetChannelAttribute ("PropagationLoss", StringValue ("ns3::IslPropagationLossModel"));
islNet = islCh.Install (satellites);
@ -90,7 +89,6 @@ LeoTestCase1::DoRun (void)
utCh.SetChannelAttribute ("PropagationDelay", StringValue ("ns3::ConstantSpeedPropagationDelayModel"));
utCh.SetSatDeviceAttribute ("InterframeGap", TimeValue (Seconds (0.001)));
utCh.SetGndDeviceAttribute ("InterframeGap", TimeValue (Seconds (0.001)));
// TODO propagation loss from mobility model
utCh.SetChannelAttribute ("PropagationLoss", StringValue ("ns3::LeoPropagationLossModel"));
utCh.SetChannelAttribute ("PropagationDelay", StringValue ("ns3::ConstantSpeedPropagationDelayModel"));
utNet = utCh.Install (satellites, terminals);
@ -109,11 +107,6 @@ LeoTestCase1::DoRun (void)
ipv4.SetBase ("10.3.0.0", "255.255.0.0");
Ipv4InterfaceContainer utIp = ipv4.Assign (utNet);
// TODO do not add UTs to cache of other UTs
//ArpCacheHelper arpCache;
//arpCache.Install (islNet, islIp);
//arpCache.Install (utNet, utIp);
// we want to ping terminals
UdpEchoServerHelper echoServer (9);
ApplicationContainer serverApps = echoServer.Install (terminals.Get (1));