dadada/ns-3-leo
dadada/ns-3-leo
1
0
Fork 0
mirror of https://gitlab.ibr.cs.tu-bs.de/tschuber/ns-3-leo.git synced 2025-06-08 01:53:58 +02:00
Code Issues Releases Wiki Activity

Fix address generation in tests

Browse source
This commit is contained in:
Tim Schubert 2020-08-07 20:30:18 +02:00
parent 42f5bac245
commit 4f41cb04af
5 changed files with 143 additions and 189 deletions
Download patch file Download diff file Expand all files Collapse all files

5
model/isl-mock-channel.cc
View file

@ -62,6 +62,11 @@ IslMockChannel::TransmitStart (
NS_LOG_FUNCTION (this << p << srcId << destAddr << txTime);
NS_LOG_LOGIC ("UID is " << p->GetUid () << ")");
if (srcId >= GetNDevices ())
{
NS_LOG_ERROR ("Source device unknown");
return false;
}
Ptr<MockNetDevice> src = DynamicCast<MockNetDevice> (GetDevice (srcId));
Ptr<MockNetDevice> dst = DynamicCast<MockNetDevice> (GetDevice (destAddr));

6
model/leo-mock-channel.cc
View file

@ -44,6 +44,12 @@ LeoMockChannel::TransmitStart (Ptr<const Packet> p,
NS_LOG_FUNCTION (this << p << devId << dst << txTime);
// Find devices joined to channel
if (devId >= GetNDevices ())
{
NS_LOG_ERROR ("Source device unknown");
return false;
}
Ptr<MockNetDevice> srcDev = DynamicCast<MockNetDevice> (GetDevice (devId));
if (srcDev == 0)
{

11
test/isl-mock-channel-test-suite.cc
View file

@ -22,7 +22,7 @@ private:
};
IslMockChannelTransmitUnknownTestCase::IslMockChannelTransmitUnknownTestCase ()
: TestCase ("Test transmission to unkown destination")
: TestCase ("Test transmission to broadcast address")
{
}
@ -37,14 +37,13 @@ IslMockChannelTransmitUnknownTestCase::DoRun (void)
Packet *packet = new Packet ();
Ptr<Packet> p = Ptr<Packet>(packet);
Ptr<MockNetDevice> dev = CreateObject<MockNetDevice> ();
dev->SetAddress (Mac48Address::Allocate ());
int32_t srcId = channel->Attach (dev);
Address destAddr;
Address destAddr = Mac48Address::GetBroadcast ();
Time txTime;
channel->SetAttribute ("PropagationDelay", StringValue ("ns3::ConstantSpeedPropagationDelayModel"));
channel->SetAttribute ("PropagationLoss", StringValue ("ns3::IslPropagationLossModel"));
bool result = channel->TransmitStart (p, srcId, destAddr, txTime);
NS_TEST_ASSERT_MSG_EQ (result, false, "Unknown destination fails to deliver");
NS_TEST_ASSERT_MSG_EQ (result, true, "Broadcast address delivers to all");
}
class IslMockChannelTransmitKnownTestCase : public TestCase
@ -81,6 +80,7 @@ IslMockChannelTransmitKnownTestCase::DoRun (void)
srcNode->AggregateObject (loc);
Ptr<MockNetDevice> srcDev = CreateObject<MockNetDevice> ();
srcDev->SetNode (srcNode);
srcDev->SetAddress (Mac48Address::Allocate ());
int32_t srcId = channel->Attach (srcDev);
Ptr<Node> dstNode = CreateObject<Node> ();
@ -88,6 +88,7 @@ IslMockChannelTransmitKnownTestCase::DoRun (void)
dstNode->AggregateObject (loc);
Ptr<MockNetDevice> dstDev = CreateObject<MockNetDevice> ();
dstDev->SetNode (dstNode);
dstDev->SetAddress (Mac48Address::Allocate ());
channel->Attach (dstDev);
Address destAddr = dstDev->GetAddress ();

72
test/leo-mock-channel-test-suite.cc
View file

@ -36,16 +36,13 @@ LeoMockChannelTransmitUnknownTestCase::DoRun (void)
Ptr<LeoMockChannel> channel = CreateObject<LeoMockChannel> ();
Packet *packet = new Packet ();
Ptr<Packet> p = Ptr<Packet>(packet);
Ptr<LeoMockNetDevice> dev = CreateObject<LeoMockNetDevice> ();
dev->SetDeviceType (LeoMockNetDevice::GND);
int32_t srcId = channel->Attach (dev);
Address destAddr;
Time txTime;
channel->SetAttribute ("PropagationDelay", StringValue ("ns3::ConstantSpeedPropagationDelayModel"));
channel->SetAttribute ("PropagationLoss", StringValue ("ns3::LeoPropagationLossModel"));
bool result = channel->TransmitStart (p, srcId, destAddr, txTime);
bool result = channel->TransmitStart (p, 10000, destAddr, txTime);
NS_TEST_ASSERT_MSG_EQ (result, false, "Unknown destination fails to deliver");
NS_TEST_ASSERT_MSG_EQ (result, false, "Unknown source fails to deliver");
}
class LeoMockChannelTransmitKnownTestCase : public TestCase
@ -78,28 +75,24 @@ LeoMockChannelTransmitKnownTestCase::DoRun (void)
Ptr<Packet> p = Ptr<Packet>(packet);
Ptr<Node> srcNode = CreateObject<Node> ();
Ptr<ConstantPositionMobilityModel> loc = CreateObject<ConstantPositionMobilityModel> ();
srcNode->AggregateObject (loc);
Ptr<LeoMockNetDevice> srcDev = CreateObject<LeoMockNetDevice> ();
srcDev->SetNode (srcNode);
srcDev->SetAttribute ("MobilityModel", StringValue ("ns3::ConstantPositionMobilityModel"));
srcDev->SetDeviceType (LeoMockNetDevice::GND);
srcDev->SetAddress (Mac48Address::Allocate ());
int32_t srcId = channel->Attach (srcDev);
Ptr<Node> dstNode = CreateObject<Node> ();
loc = CreateObject<ConstantPositionMobilityModel> ();
dstNode->AggregateObject (loc);
Ptr<LeoMockNetDevice> dstDev = CreateObject<LeoMockNetDevice> ();
dstDev->SetNode (dstNode);
dstDev->SetAttribute ("MobilityModel", StringValue ("ns3::WaypointMobilityModel"));
dstDev->SetDeviceType (LeoMockNetDevice::SAT);
dstDev->SetAddress (Mac48Address::Allocate ());
channel->Attach (dstDev);
Address destAddr = dstDev->GetAddress ();
Time txTime;
bool result = channel->TransmitStart (p, srcId, destAddr, txTime);
NS_TEST_ASSERT_MSG_EQ (result, true, "Known destination delivers");
NS_TEST_ASSERT_MSG_EQ (result, true, "Known source delivers");
}
class LeoMockChannelTransmitSpaceGroundTestCase : public TestCase
@ -134,15 +127,15 @@ LeoMockChannelTransmitSpaceGroundTestCase::DoRun (void)
Ptr<Node> srcNode = CreateObject<Node> ();
Ptr<LeoMockNetDevice> srcDev = CreateObject<LeoMockNetDevice> ();
srcDev->SetNode (srcNode);
srcDev->SetAttribute ("MobilityModel", StringValue ("ns3::WaypointMobilityModel"));
srcDev->SetDeviceType (LeoMockNetDevice::SAT);
srcDev->SetAddress (Mac48Address::Allocate ());
int32_t srcId = channel->Attach (srcDev);
Ptr<Node> dstNode = CreateObject<Node> ();
Ptr<LeoMockNetDevice> dstDev = CreateObject<LeoMockNetDevice> ();
dstDev->SetNode (dstNode);
dstDev->SetAttribute ("MobilityModel", StringValue ("ns3::ConstantPositionMobilityModel"));
dstDev->SetDeviceType (LeoMockNetDevice::GND);
dstDev->SetAddress (Mac48Address::Allocate ());
channel->Attach (dstDev);
Address destAddr = dstDev->GetAddress ();
@ -152,56 +145,6 @@ LeoMockChannelTransmitSpaceGroundTestCase::DoRun (void)
NS_TEST_ASSERT_MSG_EQ (result, true, "Space to ground destination delivers");
}
class LeoMockChannelTransmitSpaceSpaceTestCase : public TestCase
{
public:
LeoMockChannelTransmitSpaceSpaceTestCase ();
virtual ~LeoMockChannelTransmitSpaceSpaceTestCase ();
private:
virtual void DoRun (void);
};
LeoMockChannelTransmitSpaceSpaceTestCase::LeoMockChannelTransmitSpaceSpaceTestCase ()
: TestCase ("Test transmission to known destination")
{
}
LeoMockChannelTransmitSpaceSpaceTestCase::~LeoMockChannelTransmitSpaceSpaceTestCase ()
{
}
void
LeoMockChannelTransmitSpaceSpaceTestCase::DoRun (void)
{
Ptr<LeoMockChannel> channel = CreateObject<LeoMockChannel> ();
channel->SetAttribute ("PropagationDelay", StringValue ("ns3::ConstantSpeedPropagationDelayModel"));
channel->SetAttribute ("PropagationLoss", StringValue ("ns3::LeoPropagationLossModel"));
Packet *packet = new Packet ();
Ptr<Packet> p = Ptr<Packet>(packet);
Ptr<Node> srcNode = CreateObject<Node> ();
Ptr<LeoMockNetDevice> srcDev = CreateObject<LeoMockNetDevice> ();
srcDev->SetNode (srcNode);
srcDev->SetAttribute ("MobilityModel", StringValue ("ns3::WaypointMobilityModel"));
srcDev->SetDeviceType (LeoMockNetDevice::SAT);
int32_t srcId = channel->Attach (srcDev);
Ptr<Node> dstNode = CreateObject<Node> ();
Ptr<LeoMockNetDevice> dstDev = CreateObject<LeoMockNetDevice> ();
dstDev->SetNode (dstNode);
dstDev->SetAttribute ("MobilityModel", StringValue ("ns3::WaypointMobilityModel"));
dstDev->SetDeviceType (LeoMockNetDevice::SAT);
channel->Attach (dstDev);
Address destAddr = dstDev->GetAddress ();
Time txTime;
bool result = channel->TransmitStart (p, srcId, destAddr, txTime);
NS_TEST_ASSERT_MSG_EQ (result, false, "Space to space gets dropped");
}
class LeoMockChannelTestSuite : public TestSuite
{
public:
@ -215,7 +158,6 @@ LeoMockChannelTestSuite::LeoMockChannelTestSuite ()
AddTestCase (new LeoMockChannelTransmitUnknownTestCase, TestCase::QUICK);
AddTestCase (new LeoMockChannelTransmitKnownTestCase, TestCase::QUICK);
AddTestCase (new LeoMockChannelTransmitSpaceGroundTestCase, TestCase::QUICK);
AddTestCase (new LeoMockChannelTransmitSpaceSpaceTestCase, TestCase::QUICK);
}
// Do not forget to allocate an instance of this TestSuite