From d4d78eeeb3f4c06c9f1ce435650c2ce64f3d6ffb Mon Sep 17 00:00:00 2001 From: Manuel Requena Date: Fri, 2 Mar 2018 17:09:09 +0100 Subject: [PATCH] lte: (fixes #2885) Tests fail for CQA and PSS testsuites --- RELEASE_NOTES | 1 + src/lte/test/lte-test-cqa-ff-mac-scheduler.cc | 19 +++++++++---------- src/lte/test/lte-test-pss-ff-mac-scheduler.cc | 18 +++++++++--------- 3 files changed, 19 insertions(+), 19 deletions(-) diff --git a/RELEASE_NOTES b/RELEASE_NOTES index 04e5442b7..08d606fe0 100644 --- a/RELEASE_NOTES +++ b/RELEASE_NOTES @@ -68,6 +68,7 @@ Bugs fixed - Bug 2875 - tcp: Use Rule3 of RFC6675 only with SACK enabled - Bug 2876 - tcp: Do not shrink adv window after we send the FIN - Bug 2877 - wifi: Wrong data types for CWmin and CWmax +- Bug 2885 - lte: Tests fail for CQA and PSS testsuites Known issues ------------ diff --git a/src/lte/test/lte-test-cqa-ff-mac-scheduler.cc b/src/lte/test/lte-test-cqa-ff-mac-scheduler.cc index 1a4b16dba..902716e12 100644 --- a/src/lte/test/lte-test-cqa-ff-mac-scheduler.cc +++ b/src/lte/test/lte-test-cqa-ff-mac-scheduler.cc @@ -389,22 +389,23 @@ LenaCqaFfMacSchedulerTestCase1::DoRun (void) // Install downlink and uplink applications uint16_t dlPort = 1234; uint16_t ulPort = 2000; - PacketSinkHelper dlPacketSinkHelper ("ns3::UdpSocketFactory", InetSocketAddress (Ipv4Address::GetAny (), dlPort)); - PacketSinkHelper ulPacketSinkHelper ("ns3::UdpSocketFactory", InetSocketAddress (Ipv4Address::GetAny (), ulPort)); ApplicationContainer clientApps; ApplicationContainer serverApps; - serverApps.Add (ulPacketSinkHelper.Install (remoteHost)); // receive packets from UEs + PacketSinkHelper dlPacketSinkHelper ("ns3::UdpSocketFactory", InetSocketAddress (Ipv4Address::GetAny (), dlPort)); + for (uint32_t u = 0; u < ueNodes.GetN (); ++u) { ++ulPort; + PacketSinkHelper ulPacketSinkHelper ("ns3::UdpSocketFactory", InetSocketAddress (Ipv4Address::GetAny (), ulPort)); + serverApps.Add (ulPacketSinkHelper.Install (remoteHost)); // receive packets from UEs serverApps.Add (dlPacketSinkHelper.Install (ueNodes.Get (u))); // receive packets from remotehost - UdpClientHelper dlClient (ueIpIface.GetAddress (u), dlPort); // uplink packets generator + UdpClientHelper dlClient (ueIpIface.GetAddress (u), dlPort); // downlink packets generator dlClient.SetAttribute ("Interval", TimeValue (MilliSeconds (m_interval))); dlClient.SetAttribute ("MaxPackets", UintegerValue (1000000)); dlClient.SetAttribute ("PacketSize", UintegerValue (m_packetSize)); - UdpClientHelper ulClient (remoteHostAddr, ulPort); // downlink packets generator + UdpClientHelper ulClient (remoteHostAddr, ulPort); // uplink packets generator ulClient.SetAttribute ("Interval", TimeValue (MilliSeconds (m_interval))); ulClient.SetAttribute ("MaxPackets", UintegerValue (1000000)); ulClient.SetAttribute ("PacketSize", UintegerValue (m_packetSize)); @@ -627,25 +628,23 @@ LenaCqaFfMacSchedulerTestCase2::DoRun (void) // Install downlink and uplink applications uint16_t dlPort = 1234; uint16_t ulPort = 2000; - PacketSinkHelper dlPacketSinkHelper ("ns3::UdpSocketFactory", InetSocketAddress (Ipv4Address::GetAny (), dlPort)); - ApplicationContainer clientApps; ApplicationContainer serverApps; + PacketSinkHelper dlPacketSinkHelper ("ns3::UdpSocketFactory", InetSocketAddress (Ipv4Address::GetAny (), dlPort)); for (uint32_t u = 0; u < ueNodes.GetN (); ++u) { ++ulPort; PacketSinkHelper ulPacketSinkHelper ("ns3::UdpSocketFactory", InetSocketAddress (Ipv4Address::GetAny (), ulPort)); serverApps.Add (ulPacketSinkHelper.Install (remoteHost)); // receive packets from UEs - serverApps.Add (dlPacketSinkHelper.Install (ueNodes.Get (u))); // receive packets from remotehost - UdpClientHelper dlClient (ueIpIface.GetAddress (u), dlPort); // uplink packets generator + UdpClientHelper dlClient (ueIpIface.GetAddress (u), dlPort); // downlink packets generator dlClient.SetAttribute ("Interval", TimeValue (MilliSeconds (m_interval))); dlClient.SetAttribute ("MaxPackets", UintegerValue (1000000)); dlClient.SetAttribute ("PacketSize", UintegerValue (m_packetSize.at (u))); - UdpClientHelper ulClient (remoteHostAddr, ulPort); // downlink packets generator + UdpClientHelper ulClient (remoteHostAddr, ulPort); // uplink packets generator ulClient.SetAttribute ("Interval", TimeValue (MilliSeconds (m_interval))); ulClient.SetAttribute ("MaxPackets", UintegerValue (1000000)); ulClient.SetAttribute ("PacketSize", UintegerValue (m_packetSize.at (u))); diff --git a/src/lte/test/lte-test-pss-ff-mac-scheduler.cc b/src/lte/test/lte-test-pss-ff-mac-scheduler.cc index 4decc4b62..b71b76a55 100644 --- a/src/lte/test/lte-test-pss-ff-mac-scheduler.cc +++ b/src/lte/test/lte-test-pss-ff-mac-scheduler.cc @@ -386,22 +386,23 @@ LenaPssFfMacSchedulerTestCase1::DoRun (void) // Install downlink and uplink applications uint16_t dlPort = 1234; uint16_t ulPort = 2000; - PacketSinkHelper dlPacketSinkHelper ("ns3::UdpSocketFactory", InetSocketAddress (Ipv4Address::GetAny (), dlPort)); - PacketSinkHelper ulPacketSinkHelper ("ns3::UdpSocketFactory", InetSocketAddress (Ipv4Address::GetAny (), ulPort)); ApplicationContainer clientApps; ApplicationContainer serverApps; - serverApps.Add (ulPacketSinkHelper.Install (remoteHost)); // receive packets from UEs + PacketSinkHelper dlPacketSinkHelper ("ns3::UdpSocketFactory", InetSocketAddress (Ipv4Address::GetAny (), dlPort)); + for (uint32_t u = 0; u < ueNodes.GetN (); ++u) { ++ulPort; + PacketSinkHelper ulPacketSinkHelper ("ns3::UdpSocketFactory", InetSocketAddress (Ipv4Address::GetAny (), ulPort)); + serverApps.Add (ulPacketSinkHelper.Install (remoteHost)); // receive packets from UEs serverApps.Add (dlPacketSinkHelper.Install (ueNodes.Get (u))); // receive packets from remotehost - UdpClientHelper dlClient (ueIpIface.GetAddress (u), dlPort); // uplink packets generator + UdpClientHelper dlClient (ueIpIface.GetAddress (u), dlPort); // downlink packets generator dlClient.SetAttribute ("Interval", TimeValue (MilliSeconds (m_interval))); dlClient.SetAttribute ("MaxPackets", UintegerValue (1000000)); dlClient.SetAttribute ("PacketSize", UintegerValue (m_packetSize)); - UdpClientHelper ulClient (remoteHostAddr, ulPort); // downlink packets generator + UdpClientHelper ulClient (remoteHostAddr, ulPort); // uplink packets generator ulClient.SetAttribute ("Interval", TimeValue (MilliSeconds (m_interval))); ulClient.SetAttribute ("MaxPackets", UintegerValue (1000000)); ulClient.SetAttribute ("PacketSize", UintegerValue (m_packetSize)); @@ -627,24 +628,23 @@ LenaPssFfMacSchedulerTestCase2::DoRun (void) // Install downlink and uplink applications uint16_t dlPort = 1234; uint16_t ulPort = 2000; - PacketSinkHelper dlPacketSinkHelper ("ns3::UdpSocketFactory", InetSocketAddress (Ipv4Address::GetAny (), dlPort)); ApplicationContainer clientApps; ApplicationContainer serverApps; + PacketSinkHelper dlPacketSinkHelper ("ns3::UdpSocketFactory", InetSocketAddress (Ipv4Address::GetAny (), dlPort)); for (uint32_t u = 0; u < ueNodes.GetN (); ++u) { ++ulPort; PacketSinkHelper ulPacketSinkHelper ("ns3::UdpSocketFactory", InetSocketAddress (Ipv4Address::GetAny (), ulPort)); serverApps.Add (ulPacketSinkHelper.Install (remoteHost)); // receive packets from UEs - serverApps.Add (dlPacketSinkHelper.Install (ueNodes.Get (u))); // receive packets from remotehost - UdpClientHelper dlClient (ueIpIface.GetAddress (u), dlPort); // uplink packets generator + UdpClientHelper dlClient (ueIpIface.GetAddress (u), dlPort); // downlink packets generator dlClient.SetAttribute ("Interval", TimeValue (MilliSeconds (m_interval))); dlClient.SetAttribute ("MaxPackets", UintegerValue (1000000)); dlClient.SetAttribute ("PacketSize", UintegerValue (m_packetSize.at (u))); - UdpClientHelper ulClient (remoteHostAddr, ulPort); // downlink packets generator + UdpClientHelper ulClient (remoteHostAddr, ulPort); // uplink packets generator ulClient.SetAttribute ("Interval", TimeValue (MilliSeconds (m_interval))); ulClient.SetAttribute ("MaxPackets", UintegerValue (1000000)); ulClient.SetAttribute ("PacketSize", UintegerValue (m_packetSize.at (u)));