Attachment #2975 for bug #2835

View | Details | Raw Unified | Return to bug 2835
Collapse All | Expand All

(-)a/src/lte/examples/lena-deactivate-bearer.cc (-1 / +1 lines)

Lines 102-108	Link Here

102

103

  Ipv4StaticRoutingHelper ipv4RoutingHelper;

103

  Ipv4StaticRoutingHelper ipv4RoutingHelper;

104

  Ptr<Ipv4StaticRouting> remoteHostStaticRouting = ipv4RoutingHelper.GetStaticRouting (remoteHost->GetObject<Ipv4> ());

104

  Ptr<Ipv4StaticRouting> remoteHostStaticRouting = ipv4RoutingHelper.GetStaticRouting (remoteHost->GetObject<Ipv4> ());

105

  remoteHostStaticRouting->AddNetworkRouteTo (Ipv4Address ("7.0.0.0"), Ipv4Mask ("255.0.0.0"), 1);

105

  remoteHostStaticRouting->AddNetworkRouteTo (Ipv4Address ("7.0.0.0"), Ipv4Mask ("255.255.0.0"), 1);

106

107

  NodeContainer ueNodes;

107

  NodeContainer ueNodes;

108

  NodeContainer enbNodes;

108

  NodeContainer enbNodes;

(-)a/src/lte/examples/lena-distributed-ffr.cc (-1 / +1 lines)

Lines 158-164	Link Here

158

  Ipv4StaticRoutingHelper ipv4RoutingHelper;

158

  Ipv4StaticRoutingHelper ipv4RoutingHelper;

159

  Ptr<Ipv4StaticRouting> remoteHostStaticRouting = ipv4RoutingHelper.GetStaticRouting (remoteHost->GetObject<Ipv4> ());

159

  Ptr<Ipv4StaticRouting> remoteHostStaticRouting = ipv4RoutingHelper.GetStaticRouting (remoteHost->GetObject<Ipv4> ());

160

  // interface 0 is localhost, 1 is the p2p device

160

  // interface 0 is localhost, 1 is the p2p device

161

  remoteHostStaticRouting->AddNetworkRouteTo (Ipv4Address ("7.0.0.0"), Ipv4Mask ("255.0.0.0"), 1);

161

  remoteHostStaticRouting->AddNetworkRouteTo (Ipv4Address ("7.0.0.0"), Ipv4Mask ("255.255.0.0"), 1);

162

163

  // Create Nodes: eNodeB and UE

163

  // Create Nodes: eNodeB and UE

164

  NodeContainer enbNodes;

164

  NodeContainer enbNodes;

(-)a/src/lte/examples/lena-dual-stripe.cc (-1 / +1 lines)

Lines 671-677	Link Here

671

672

      Ipv4StaticRoutingHelper ipv4RoutingHelper;

672

      Ipv4StaticRoutingHelper ipv4RoutingHelper;

673

      Ptr<Ipv4StaticRouting> remoteHostStaticRouting = ipv4RoutingHelper.GetStaticRouting (remoteHost->GetObject<Ipv4> ());

673

      Ptr<Ipv4StaticRouting> remoteHostStaticRouting = ipv4RoutingHelper.GetStaticRouting (remoteHost->GetObject<Ipv4> ());

674

      remoteHostStaticRouting->AddNetworkRouteTo (Ipv4Address ("7.0.0.0"), Ipv4Mask ("255.0.0.0"), 1);

674

      remoteHostStaticRouting->AddNetworkRouteTo (Ipv4Address ("7.0.0.0"), Ipv4Mask ("255.255.0.0"), 1);

675

676

      // for internetworking purposes, consider together home UEs and macro UEs

676

      // for internetworking purposes, consider together home UEs and macro UEs

677

      ues.Add (homeUes);

677

      ues.Add (homeUes);

(-)a/src/lte/examples/lena-simple-epc-emu.cc (-1 / +1 lines)

Lines 113-119	Link Here

113

114

  Ipv4StaticRoutingHelper ipv4RoutingHelper;

114

  Ipv4StaticRoutingHelper ipv4RoutingHelper;

115

  Ptr<Ipv4StaticRouting> remoteHostStaticRouting = ipv4RoutingHelper.GetStaticRouting (remoteHost->GetObject<Ipv4> ());

115

  Ptr<Ipv4StaticRouting> remoteHostStaticRouting = ipv4RoutingHelper.GetStaticRouting (remoteHost->GetObject<Ipv4> ());

116

  remoteHostStaticRouting->AddNetworkRouteTo (Ipv4Address ("7.0.0.0"), Ipv4Mask ("255.0.0.0"), 1);

116

  remoteHostStaticRouting->AddNetworkRouteTo (Ipv4Address ("7.0.0.0"), Ipv4Mask ("255.255.0.0"), 1);

117

118

  NodeContainer ueNodes;

118

  NodeContainer ueNodes;

119

  NodeContainer enbNodes;

119

  NodeContainer enbNodes;

(-)a/src/lte/examples/lena-simple-epc.cc (-1 / +1 lines)

Lines 100-106	Link Here

100

101

  Ipv4StaticRoutingHelper ipv4RoutingHelper;

101

  Ipv4StaticRoutingHelper ipv4RoutingHelper;

102

  Ptr<Ipv4StaticRouting> remoteHostStaticRouting = ipv4RoutingHelper.GetStaticRouting (remoteHost->GetObject<Ipv4> ());

102

  Ptr<Ipv4StaticRouting> remoteHostStaticRouting = ipv4RoutingHelper.GetStaticRouting (remoteHost->GetObject<Ipv4> ());

103

  remoteHostStaticRouting->AddNetworkRouteTo (Ipv4Address ("7.0.0.0"), Ipv4Mask ("255.0.0.0"), 1);

103

  remoteHostStaticRouting->AddNetworkRouteTo (Ipv4Address ("7.0.0.0"), Ipv4Mask ("255.255.0.0"), 1);

104

105

  NodeContainer ueNodes;

105

  NodeContainer ueNodes;

106

  NodeContainer enbNodes;

106

  NodeContainer enbNodes;




/* -*-  Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */
/*
 * Copyright (c) 2011 Centre Tecnologic de Telecomunicacions de Catalunya (CTTC)
 *
 * This program is free software; you can redistribute it and/or modify
 * it under the terms of the GNU General Public License version 2 as
 * published by the Free Software Foundation;
 *
 * This program is distributed in the hope that it will be useful,
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 * GNU General Public License for more details.
 *
 * You should have received a copy of the GNU General Public License
 * along with this program; if not, write to the Free Software
 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 *
 * Author: Jaume Nin <jaume.nin@cttc.cat>
 *         Tommaso Pecorella <tommaso.pecorella@unifi.it>
 */

#include "ns3/lte-helper.h"
#include "ns3/epc-helper.h"
#include "ns3/core-module.h"
#include "ns3/network-module.h"
#include "ns3/ipv4-global-routing-helper.h"
#include "ns3/internet-module.h"
#include "ns3/mobility-module.h"
#include "ns3/lte-module.h"
#include "ns3/applications-module.h"
#include "ns3/csma-helper.h"
#include "ns3/config-store.h"
//#include "ns3/gtk-config-store.h"

using namespace ns3;

/**
 * Sample simulation script for LTE+EPC. It instantiates several eNodeB,
 * attaches one UE per eNodeB starts a flow for each UE to  and from a remote host.
 * It also  starts yet another flow between each UE pair.
 */

NS_LOG_COMPONENT_DEFINE ("EpcFirstExample");

int
main (int argc, char *argv[])
{

  uint16_t numberOfNodes = 2;
  double simTime = 1.1;
  double distance = 60.0;
  double interPacketInterval = 100;
  bool useCa = false;

//  LogComponentEnable ("PointToPointEpcHelper", LOG_LEVEL_ALL);

  // Command line arguments
  CommandLine cmd;
  cmd.AddValue("numberOfNodes", "Number of eNodeBs + UE pairs", numberOfNodes);
  cmd.AddValue("simTime", "Total duration of the simulation [s])", simTime);
  cmd.AddValue("distance", "Distance between eNBs [m]", distance);
  cmd.AddValue("interPacketInterval", "Inter packet interval [ms])", interPacketInterval);
  cmd.AddValue("useCa", "Whether to use carrier aggregation.", useCa);
  cmd.Parse(argc, argv);

  ConfigStore inputConfig;
  inputConfig.ConfigureDefaults();

  // parse again so you can override default values from the command line
  cmd.Parse(argc, argv);

  if (useCa)
    {
      Config::SetDefault ("ns3::LteHelper::UseCa", BooleanValue (useCa));
      Config::SetDefault ("ns3::LteHelper::NumberOfComponentCarriers", UintegerValue (2));
      Config::SetDefault ("ns3::LteHelper::EnbComponentCarrierManager", StringValue ("ns3::RrComponentCarrierManager"));
    }

  InternetStackHelper internet;
  Ipv4StaticRoutingHelper ipv4RoutingHelper;

  // Network A
  Ptr<LteHelper> lteAHelper = CreateObject<LteHelper> ();
  Ptr<PointToPointEpcHelper>  epcAHelper = CreateObject<PointToPointEpcHelper> ();
  lteAHelper->SetEpcHelper (epcAHelper);

  Ptr<Node> pgwA = epcAHelper->GetPgwNode ();

  // Network A
  NodeContainer ueNodesA;
  NodeContainer enbNodesA;
  enbNodesA.Create(numberOfNodes);
  ueNodesA.Create(numberOfNodes);

  // Install Mobility Model
  Ptr<ListPositionAllocator> positionAlloc = CreateObject<ListPositionAllocator> ();
  for (uint16_t i = 0; i < numberOfNodes; i++)
    {
      positionAlloc->Add (Vector(distance * i, 0, 0));
    }
  MobilityHelper mobilityA;
  mobilityA.SetMobilityModel("ns3::ConstantPositionMobilityModel");
  mobilityA.SetPositionAllocator(positionAlloc);
  mobilityA.Install(enbNodesA);
  mobilityA.Install(ueNodesA);

  // Install LTE Devices to the nodes
  NetDeviceContainer enbLteADevs = lteAHelper->InstallEnbDevice (enbNodesA);
  NetDeviceContainer ueLteADevs = lteAHelper->InstallUeDevice (ueNodesA);

  // Install the IP stack on the UEs
  internet.Install (ueNodesA);
  Ipv4InterfaceContainer ueAIpIface;
  ueAIpIface = epcAHelper->AssignUeIpv4Address (NetDeviceContainer (ueLteADevs));
  // Assign IP address to UEs, and install applications
  for (uint32_t u = 0; u < ueNodesA.GetN (); ++u)
    {
      Ptr<Node> ueNode = ueNodesA.Get (u);
      // Set the default gateway for the UE
      Ptr<Ipv4StaticRouting> ueStaticRouting = ipv4RoutingHelper.GetStaticRouting (ueNode->GetObject<Ipv4> ());
      ueStaticRouting->SetDefaultRoute (epcAHelper->GetUeDefaultGatewayAddress (), 1);
    }

  // Attach one UE per eNodeB
  for (uint16_t i = 0; i < numberOfNodes; i++)
    {
      lteAHelper->Attach (ueLteADevs.Get(i), enbLteADevs.Get(i));
      // side effect: the default EPS bearer will be activated
    }

  // Network B
  Ptr<LteHelper> lteBHelper = CreateObject<LteHelper> ();
  Ptr<PointToPointEpcHelper>  epcBHelper = CreateObject<PointToPointEpcHelper> ();
  lteBHelper->SetEpcHelper (epcBHelper);

  Ptr<Node> pgwB = epcBHelper->GetPgwNode ();

  NodeContainer ueNodesB;
  NodeContainer enbNodesB;
  enbNodesB.Create(numberOfNodes);
  ueNodesB.Create(numberOfNodes);

  // Install Mobility Model
  Ptr<ListPositionAllocator> positionAllocB = CreateObject<ListPositionAllocator> ();
  for (uint16_t i = 0; i < numberOfNodes; i++)
    {
      positionAllocB->Add (Vector(distance * i, 500, 0));
    }
  MobilityHelper mobilityB;
  mobilityB.SetMobilityModel("ns3::ConstantPositionMobilityModel");
  mobilityB.SetPositionAllocator(positionAllocB);
  mobilityB.Install(enbNodesB);
  mobilityB.Install(ueNodesB);

  // Install LTE Devices to the nodes
  NetDeviceContainer enbLteBDevs = lteBHelper->InstallEnbDevice (enbNodesB);
  NetDeviceContainer ueLteBDevs = lteBHelper->InstallUeDevice (ueNodesB);

  // Install the IP stack on the UEs
  internet.Install (ueNodesB);
  Ipv4InterfaceContainer ueBIpIface;
  ueBIpIface = epcBHelper->AssignUeIpv4Address (NetDeviceContainer (ueLteBDevs));
  // Assign IP address to UEs, and install applications
  for (uint32_t u = 0; u < ueNodesB.GetN (); ++u)
    {
      Ptr<Node> ueNode = ueNodesB.Get (u);
      // Set the default gateway for the UE
      Ptr<Ipv4StaticRouting> ueStaticRouting = ipv4RoutingHelper.GetStaticRouting (ueNode->GetObject<Ipv4> ());
      ueStaticRouting->SetDefaultRoute (epcBHelper->GetUeDefaultGatewayAddress (), 1);
    }

  // Attach one UE per eNodeB
  for (uint16_t i = 0; i < numberOfNodes; i++)
    {
      lteBHelper->Attach (ueLteBDevs.Get(i), enbLteBDevs.Get(i));
      // side effect: the default EPS bearer will be activated
    }

  // Create a single RemoteHost
  NodeContainer remoteHostContainer;
  remoteHostContainer.Create (1);
  Ptr<Node> remoteHost = remoteHostContainer.Get (0);
  internet.Install (remoteHostContainer);

  // Create the Internet
  CsmaHelper csma;
  NodeContainer internetNodes;
  internetNodes.Add (remoteHost);
  internetNodes.Add (pgwA);
  internetNodes.Add (pgwB);

  csma.SetDeviceAttribute ("Mtu", UintegerValue (1500));
  csma.SetChannelAttribute ("DataRate", DataRateValue (DataRate ("100Gb/s")));
  csma.SetChannelAttribute ("Delay", TimeValue (Seconds (0.010)));
  NetDeviceContainer internetDevices = csma.Install (internetNodes);
  Ipv4AddressHelper ipv4h;
  ipv4h.SetBase ("1.0.0.0", "255.0.0.0");
  Ipv4InterfaceContainer internetIpIfaces = ipv4h.Assign (internetDevices);
  // interface 0 is localhost, 1 is the csma device
  Ipv4Address remoteHostAddr = internetIpIfaces.GetAddress (1);

  Ptr<Ipv4StaticRouting> remoteHostStaticRouting = ipv4RoutingHelper.GetStaticRouting (remoteHost->GetObject<Ipv4> ());
  remoteHostStaticRouting->AddNetworkRouteTo (Ipv4Address ("7.0.0.0"), Ipv4Mask ("255.255.0.0"), 1);


  // Install and start applications on UEs and remote host
  uint16_t dlPort = 1234;
  uint16_t ulPort = 2000;
  uint16_t otherPort = 3000;
  ApplicationContainer clientApps;
  ApplicationContainer serverApps;
  for (uint32_t u = 0; u < ueNodesA.GetN (); ++u)
    {
      ++ulPort;
      ++otherPort;
      PacketSinkHelper dlPacketSinkHelper ("ns3::UdpSocketFactory", InetSocketAddress (Ipv4Address::GetAny (), dlPort));
      PacketSinkHelper ulPacketSinkHelper ("ns3::UdpSocketFactory", InetSocketAddress (Ipv4Address::GetAny (), ulPort));
      PacketSinkHelper packetSinkHelper ("ns3::UdpSocketFactory", InetSocketAddress (Ipv4Address::GetAny (), otherPort));
      serverApps.Add (dlPacketSinkHelper.Install (ueNodesA.Get(u)));
      serverApps.Add (ulPacketSinkHelper.Install (remoteHost));
      serverApps.Add (packetSinkHelper.Install (ueNodesA.Get(u)));

      UdpClientHelper dlClient (ueAIpIface.GetAddress (u), dlPort);
      dlClient.SetAttribute ("Interval", TimeValue (MilliSeconds(interPacketInterval)));
      dlClient.SetAttribute ("MaxPackets", UintegerValue(1000000));

      UdpClientHelper ulClient (remoteHostAddr, ulPort);
      ulClient.SetAttribute ("Interval", TimeValue (MilliSeconds(interPacketInterval)));
      ulClient.SetAttribute ("MaxPackets", UintegerValue(1000000));

      UdpClientHelper client (ueAIpIface.GetAddress (u), otherPort);
      client.SetAttribute ("Interval", TimeValue (MilliSeconds(interPacketInterval)));
      client.SetAttribute ("MaxPackets", UintegerValue(1000000));

      clientApps.Add (dlClient.Install (remoteHost));
      clientApps.Add (ulClient.Install (ueNodesA.Get(u)));
      if (u+1 < ueNodesA.GetN ())
        {
          clientApps.Add (client.Install (ueNodesA.Get(u+1)));
        }
      else
        {
          clientApps.Add (client.Install (ueNodesA.Get(0)));
        }
    }
  for (uint32_t u = 0; u < ueNodesB.GetN (); ++u)
    {
      ++ulPort;
      ++otherPort;
      PacketSinkHelper dlPacketSinkHelper ("ns3::UdpSocketFactory", InetSocketAddress (Ipv4Address::GetAny (), dlPort));
      PacketSinkHelper ulPacketSinkHelper ("ns3::UdpSocketFactory", InetSocketAddress (Ipv4Address::GetAny (), ulPort));
      PacketSinkHelper packetSinkHelper ("ns3::UdpSocketFactory", InetSocketAddress (Ipv4Address::GetAny (), otherPort));
      serverApps.Add (dlPacketSinkHelper.Install (ueNodesB.Get(u)));
      serverApps.Add (ulPacketSinkHelper.Install (remoteHost));
      serverApps.Add (packetSinkHelper.Install (ueNodesB.Get(u)));

      UdpClientHelper dlClient (ueBIpIface.GetAddress (u), dlPort);
      dlClient.SetAttribute ("Interval", TimeValue (MilliSeconds(interPacketInterval)));
      dlClient.SetAttribute ("MaxPackets", UintegerValue(1000000));

      UdpClientHelper ulClient (remoteHostAddr, ulPort);
      ulClient.SetAttribute ("Interval", TimeValue (MilliSeconds(interPacketInterval)));
      ulClient.SetAttribute ("MaxPackets", UintegerValue(1000000));

      UdpClientHelper client (ueBIpIface.GetAddress (u), otherPort);
      client.SetAttribute ("Interval", TimeValue (MilliSeconds(interPacketInterval)));
      client.SetAttribute ("MaxPackets", UintegerValue(1000000));

      clientApps.Add (dlClient.Install (remoteHost));
      clientApps.Add (ulClient.Install (ueNodesB.Get(u)));
      if (u+1 < ueNodesA.GetN ())
        {
          clientApps.Add (client.Install (ueNodesB.Get(u+1)));
        }
      else
        {
          clientApps.Add (client.Install (ueNodesB.Get(0)));
        }
    }
  serverApps.Start (Seconds (0.01));
  clientApps.Start (Seconds (0.01));
  lteAHelper->EnableTraces ();
  lteBHelper->EnableTraces ();
  // Uncomment to enable PCAP tracing
  //p2ph.EnablePcapAll("lena-epc-first");

  Simulator::Stop(Seconds(simTime));
  Simulator::Run();

  /*GtkConfigStore config;
  config.ConfigureAttributes();*/

  Simulator::Destroy();
  return 0;

}


(-)a/src/lte/examples/lena-x2-handover-measures.cc (-1 / +1 lines)

Lines 206-212	Link Here

206

  Ipv4StaticRoutingHelper ipv4RoutingHelper;

206

  Ipv4StaticRoutingHelper ipv4RoutingHelper;

207

  Ptr<Ipv4StaticRouting> remoteHostStaticRouting = ipv4RoutingHelper.GetStaticRouting (remoteHost->GetObject<Ipv4> ());

207

  Ptr<Ipv4StaticRouting> remoteHostStaticRouting = ipv4RoutingHelper.GetStaticRouting (remoteHost->GetObject<Ipv4> ());

208

  // interface 0 is localhost, 1 is the p2p device

208

  // interface 0 is localhost, 1 is the p2p device

209

  remoteHostStaticRouting->AddNetworkRouteTo (Ipv4Address ("7.0.0.0"), Ipv4Mask ("255.0.0.0"), 1);

209

  remoteHostStaticRouting->AddNetworkRouteTo (Ipv4Address ("7.0.0.0"), Ipv4Mask ("255.255.0.0"), 1);

210

211

/*

211

/*

212

   * Network topology:

212

   * Network topology:

(-)a/src/lte/examples/lena-x2-handover.cc (-1 / +1 lines)

Lines 187-193	Link Here

187

  Ipv4StaticRoutingHelper ipv4RoutingHelper;

187

  Ipv4StaticRoutingHelper ipv4RoutingHelper;

188

  Ptr<Ipv4StaticRouting> remoteHostStaticRouting = ipv4RoutingHelper.GetStaticRouting (remoteHost->GetObject<Ipv4> ());

188

  Ptr<Ipv4StaticRouting> remoteHostStaticRouting = ipv4RoutingHelper.GetStaticRouting (remoteHost->GetObject<Ipv4> ());

189

  // interface 0 is localhost, 1 is the p2p device

189

  // interface 0 is localhost, 1 is the p2p device

190

  remoteHostStaticRouting->AddNetworkRouteTo (Ipv4Address ("7.0.0.0"), Ipv4Mask ("255.0.0.0"), 1);

190

  remoteHostStaticRouting->AddNetworkRouteTo (Ipv4Address ("7.0.0.0"), Ipv4Mask ("255.255.0.0"), 1);

191

192

  NodeContainer ueNodes;

192

  NodeContainer ueNodes;

193

  NodeContainer enbNodes;

193

  NodeContainer enbNodes;

(-)a/src/lte/examples/wscript (+3 lines)

Lines 34-39	Link Here

    obj = bld.create_ns3_program('lena-simple-epc',

    obj = bld.create_ns3_program('lena-simple-epc',

                                 ['lte'])

                                 ['lte'])

    obj.source = 'lena-simple-epc.cc'

    obj.source = 'lena-simple-epc.cc'

    obj = bld.create_ns3_program('lena-simple-two-epc',

                                 ['lte'])

    obj.source = 'lena-simple-two-epc.cc'

    obj = bld.create_ns3_program('lena-deactivate-bearer',

    obj = bld.create_ns3_program('lena-deactivate-bearer',

                                 ['lte'])

                                 ['lte'])

    obj.source = 'lena-deactivate-bearer.cc'

    obj.source = 'lena-deactivate-bearer.cc'

(-)a/src/lte/helper/emu-epc-helper.cc (-3 / +22 lines)

Lines 26-31	Link Here

#include <ns3/mac48-address.h>

#include <ns3/mac48-address.h>

#include <ns3/eps-bearer.h>

#include <ns3/eps-bearer.h>

#include <ns3/ipv4-address.h>

#include <ns3/ipv4-address.h>

#include <ns3/ipv4-address-generator.h>

#include <ns3/internet-stack-helper.h>

#include <ns3/internet-stack-helper.h>

#include <ns3/packet-socket-helper.h>

#include <ns3/packet-socket-helper.h>

#include <ns3/packet-socket-address.h>

#include <ns3/packet-socket-address.h>

Lines 91-110	Link Here

                   StringValue ("00:00:00:eb:00"),

                   StringValue ("00:00:00:eb:00"),

                   MakeStringAccessor (&EmuEpcHelper::m_enbMacAddressBase),

                   MakeStringAccessor (&EmuEpcHelper::m_enbMacAddressBase),

                   MakeStringChecker ())

                   MakeStringChecker ())

    .AddAttribute ("BaseIpv4Prefix",

                   "The 8 bit IPv4 prefix to be used for the assignment of IPv4 addresses to PGW and UE.",

                   Ipv4AddressValue (Ipv4Address ("7.0.0.0")),

                   MakeIpv4AddressAccessor (&EmuEpcHelper::m_uePgwBaseIpv4Prefix),

                   MakeIpv4AddressChecker ())

100

  return tid;

101

  return tid;

102

103

104

TypeId

105

EmuEpcHelper::GetInstanceTypeId () const

106

107

  return GetTypeId ();

108

109

110

void

111

void

EmuEpcHelper::DoInitialize ()

112

EmuEpcHelper::DoInitialize ()

100

113

101

  NS_LOG_LOGIC (this);

114

  NS_LOG_LOGIC (this);

102

115

116

  // we use a /16 bit IPv4 net for an EPC network

117

  m_uePgwCurrentIpv4Prefix = m_uePgwBaseIpv4Prefix.CombineMask (Ipv4Mask ("255.0.0.0"));  //Initialize

118

  Ipv4AddressGenerator::Init (m_uePgwCurrentIpv4Prefix, Ipv4Mask ("255.255.0.0"));

103

119

104

  // we use a /8 net for all UEs

120

  while (!Ipv4AddressGenerator::IsNetworkAllocated (m_uePgwCurrentIpv4Prefix, Ipv4Mask ("255.255.0.0")))

105

  m_ueAddressHelper.SetBase ("7.0.0.0", "255.0.0.0");

121

122

      m_uePgwCurrentIpv4Prefix = Ipv4AddressGenerator::NextNetwork (Ipv4Mask ("255.255.0.0"));

123

106

124

107

125

  m_ueAddressHelper.SetBase (m_uePgwCurrentIpv4Prefix, "255.255.0.0"); //The helper will assign IPv4 addresses using this 16 bit prefix

126

  //Now we get an unique 16 bit IPv4 prefix for this EPC, which not used by any other EPC

108

127

109

  // create SgwPgwNode

128

  // create SgwPgwNode

110

  m_sgwPgw = CreateObject<Node> ();

129

  m_sgwPgw = CreateObject<Node> ();

(-)a/src/lte/helper/emu-epc-helper.h (+22 lines)

Lines 70-78	Link Here

   *  \return The object TypeId.

   *  \return The object TypeId.

*/

*/

  static TypeId GetTypeId (void);

  static TypeId GetTypeId (void);

  TypeId GetInstanceTypeId () const;

  virtual void DoInitialize ();

  virtual void DoInitialize ();

  virtual void DoDispose ();

  virtual void DoDispose ();

/**

   * Get the IPv4 network address used by the EPC.

   * The EPC will use a /16 network address.

   * \returns The EPC IPv4 network address.

*/

  Ipv4Address GetEpcIpv4NetworkAddress ();

  // inherited from EpcHelper

  // inherited from EpcHelper

  virtual void AddEnb (Ptr<Node> enbNode, Ptr<NetDevice> lteEnbNetDevice, uint16_t cellId);

  virtual void AddEnb (Ptr<Node> enbNode, Ptr<NetDevice> lteEnbNetDevice, uint16_t cellId);

  virtual void AddUe (Ptr<NetDevice> ueLteDevice, uint64_t imsi);

  virtual void AddUe (Ptr<NetDevice> ueLteDevice, uint64_t imsi);

Lines 92-97	Link Here

  Ipv4AddressHelper m_ueAddressHelper;

101

  Ipv4AddressHelper m_ueAddressHelper;

102

/**

103

/**

104

   * The common 8 bit prefix used for the IPv4 address assignment of

105

   * all the EPC networks

106

*/

107

  Ipv4Address m_uePgwBaseIpv4Prefix;

108

109

/**

110

   * The 16 bit prefix used for the IPv4 address assignment of

111

   * the UE and PGW.

112

   * The current IPv4 prefix will be the first available one in the /8 pool.

113

*/

114

  Ipv4Address m_uePgwCurrentIpv4Prefix;

115

116

/**

   * SGW-PGW network element

117

   * SGW-PGW network element

*/

118

*/

  Ptr<Node> m_sgwPgw;

119

  Ptr<Node> m_sgwPgw;

(-)a/src/lte/helper/point-to-point-epc-helper.cc (-12 / +51 lines)

Lines 18-23	Link Here

 * Author: Jaume Nin <jnin@cttc.es>

 * Author: Jaume Nin <jnin@cttc.es>

 *         Nicola Baldo <nbaldo@cttc.es>

 *         Nicola Baldo <nbaldo@cttc.es>

 *         Manuel Requena <manuel.requena@cttc.es>

 *         Manuel Requena <manuel.requena@cttc.es>

 *         Manoj Kumar Rana <manoj24.rana@gmail.com>

*/

*/

#include <ns3/point-to-point-epc-helper.h>

#include <ns3/point-to-point-epc-helper.h>

Lines 26-31	Link Here

#include <ns3/mac48-address.h>

#include <ns3/mac48-address.h>

#include <ns3/eps-bearer.h>

#include <ns3/eps-bearer.h>

#include <ns3/ipv4-address.h>

#include <ns3/ipv4-address.h>

#include <ns3/ipv4-address-generator.h>

#include <ns3/internet-stack-helper.h>

#include <ns3/internet-stack-helper.h>

#include <ns3/point-to-point-helper.h>

#include <ns3/point-to-point-helper.h>

#include <ns3/packet-socket-helper.h>

#include <ns3/packet-socket-helper.h>

Lines 52-67	Link Here

  NS_LOG_FUNCTION (this);

  NS_LOG_FUNCTION (this);

  // To access the attribute value within the constructor

  ObjectBase::ConstructSelf (AttributeConstructionList ());

  // since we use point-to-point links for all S1-U links,

  // since we use point-to-point links for all S1-U links,

  // we use a /30 subnet which can hold exactly two addresses

  // we use a /30 subnet which can hold exactly two addresses

  // (remember that net broadcast and null address are not valid)

  // (remember that net broadcast and null address are not valid)

  m_s1uIpv4AddressHelper.SetBase ("10.0.0.0", "255.255.255.252");

  Ipv4Address s1uIpv4AddressNet = Ipv4Address ("10.0.0.0");

  Ipv4AddressGenerator::Init (s1uIpv4AddressNet, Ipv4Mask ("255.255.0.0"));

  while (!Ipv4AddressGenerator::IsNetworkAllocated (s1uIpv4AddressNet, Ipv4Mask ("255.255.0.0")))

      s1uIpv4AddressNet = Ipv4AddressGenerator::NextNetwork (Ipv4Mask ("255.255.0.0"));

  m_s1uIpv4AddressHelper.SetBase (s1uIpv4AddressNet, "255.255.255.252");

  m_x2Ipv4AddressHelper.SetBase ("12.0.0.0", "255.255.255.252");

  std::cout << "m_s1uIpv4AddressHelper set to " << s1uIpv4AddressNet << std::endl;

  // we use a /8 net for all UEs

  Ipv4Address x2Ipv4AddressNet = Ipv4Address ("12.0.0.0");

  m_ueAddressHelper.SetBase ("7.0.0.0", "255.0.0.0");

  Ipv4AddressGenerator::Init (x2Ipv4AddressNet, Ipv4Mask ("255.255.0.0"));

  while (!Ipv4AddressGenerator::IsNetworkAllocated (x2Ipv4AddressNet, Ipv4Mask ("255.255.0.0")))

      x2Ipv4AddressNet = Ipv4AddressGenerator::NextNetwork (Ipv4Mask ("255.255.0.0"));

  m_x2Ipv4AddressHelper.SetBase (x2Ipv4AddressNet, "255.255.255.252");

  std::cout << "m_x2Ipv4AddressHelper set to " << x2Ipv4AddressNet << std::endl;

  // we use a /16 bit IPv4 net for an EPC network

  m_uePgwCurrentIpv4Prefix = m_uePgwBaseIpv4Prefix.CombineMask (Ipv4Mask ("255.0.0.0"));  //Initialize

  Ipv4AddressGenerator::Init (m_uePgwCurrentIpv4Prefix, Ipv4Mask ("255.255.0.0"));

  while (!Ipv4AddressGenerator::IsNetworkAllocated (m_uePgwCurrentIpv4Prefix, Ipv4Mask ("255.255.0.0")))

      m_uePgwCurrentIpv4Prefix = Ipv4AddressGenerator::NextNetwork (Ipv4Mask ("255.255.0.0"));

  m_ueAddressHelper.SetBase (m_uePgwCurrentIpv4Prefix, "255.255.0.0"); //The helper will assign IPv4 addresses using this 16 bit prefix

  //Now we get an unique 16 bit IPv4 prefix for this EPC, which not used by any other EPC

  std::cout << "m_ueAddressHelper set to " << m_uePgwCurrentIpv4Prefix << std::endl;

  // create SgwPgwNode

  // create SgwPgwNode

  m_sgwPgw = CreateObject<Node> ();

  m_sgwPgw = CreateObject<Node> ();

  InternetStackHelper internet;

  InternetStackHelper internet;

Lines 144-153	Link Here

144

                   UintegerValue (3000),

176

                   UintegerValue (3000),

145

                   MakeUintegerAccessor (&PointToPointEpcHelper::m_x2LinkMtu),

177

                   MakeUintegerAccessor (&PointToPointEpcHelper::m_x2LinkMtu),

146

                   MakeUintegerChecker<uint16_t> ())

178

                   MakeUintegerChecker<uint16_t> ())

147

179

     .AddAttribute ("BaseIpv4Prefix",

180

                    "The 8 bit IPv4 prefix to be used for the assignment of IPv4 addresses to PGW and UE.",

181

                    Ipv4AddressValue (Ipv4Address ("7.0.0.0")),

182

                    MakeIpv4AddressAccessor (&PointToPointEpcHelper::m_uePgwBaseIpv4Prefix),

183

                    MakeIpv4AddressChecker ())

184

148

  return tid;

185

  return tid;

149

186

150

187

188

TypeId

189

PointToPointEpcHelper::GetInstanceTypeId () const

190

191

  return GetTypeId ();

192

193

151

void

194

void

152

PointToPointEpcHelper::DoDispose ()

195

PointToPointEpcHelper::DoDispose ()

153

196

Lines 184-191	Link Here

184

  NS_LOG_LOGIC ("number of Ipv4 ifaces of the eNB after installing p2p dev: " << enb->GetObject<Ipv4> ()->GetNInterfaces ());

227

  NS_LOG_LOGIC ("number of Ipv4 ifaces of the eNB after installing p2p dev: " << enb->GetObject<Ipv4> ()->GetNInterfaces ());

185

  Ptr<NetDevice> enbDev = enbSgwDevices.Get (0);

228

  Ptr<NetDevice> enbDev = enbSgwDevices.Get (0);

186

  Ptr<NetDevice> sgwDev = enbSgwDevices.Get (1);

229

  Ptr<NetDevice> sgwDev = enbSgwDevices.Get (1);

230

  Ipv4InterfaceContainer enbSgwIpIfaces = m_s1uIpv4AddressHelper.Assign (enbSgwDevices);

187

  m_s1uIpv4AddressHelper.NewNetwork ();

231

  m_s1uIpv4AddressHelper.NewNetwork ();

188

  Ipv4InterfaceContainer enbSgwIpIfaces = m_s1uIpv4AddressHelper.Assign (enbSgwDevices);

189

  NS_LOG_LOGIC ("number of Ipv4 ifaces of the eNB after assigning Ipv4 addr to S1 dev: " << enb->GetObject<Ipv4> ()->GetNInterfaces ());

232

  NS_LOG_LOGIC ("number of Ipv4 ifaces of the eNB after assigning Ipv4 addr to S1 dev: " << enb->GetObject<Ipv4> ()->GetNInterfaces ());

190

233

191

  Ipv4Address enbAddress = enbSgwIpIfaces.GetAddress (0);

234

  Ipv4Address enbAddress = enbSgwIpIfaces.GetAddress (0);

Lines 255-262	Link Here

255

  Ptr<NetDevice> enb1Dev = enbDevices.Get (0);

298

  Ptr<NetDevice> enb1Dev = enbDevices.Get (0);

256

  Ptr<NetDevice> enb2Dev = enbDevices.Get (1);

299

  Ptr<NetDevice> enb2Dev = enbDevices.Get (1);

257

300

301

  Ipv4InterfaceContainer enbIpIfaces = m_x2Ipv4AddressHelper.Assign (enbDevices);

258

  m_x2Ipv4AddressHelper.NewNetwork ();

302

  m_x2Ipv4AddressHelper.NewNetwork ();

259

  Ipv4InterfaceContainer enbIpIfaces = m_x2Ipv4AddressHelper.Assign (enbDevices);

260

  NS_LOG_LOGIC ("number of Ipv4 ifaces of the eNB #1 after assigning Ipv4 addr to X2 dev: " << enb1->GetObject<Ipv4> ()->GetNInterfaces ());

303

  NS_LOG_LOGIC ("number of Ipv4 ifaces of the eNB #1 after assigning Ipv4 addr to X2 dev: " << enb1->GetObject<Ipv4> ()->GetNInterfaces ());

261

  NS_LOG_LOGIC ("number of Ipv4 ifaces of the eNB #2 after assigning Ipv4 addr to X2 dev: " << enb2->GetObject<Ipv4> ()->GetNInterfaces ());

304

  NS_LOG_LOGIC ("number of Ipv4 ifaces of the eNB #2 after assigning Ipv4 addr to X2 dev: " << enb2->GetObject<Ipv4> ()->GetNInterfaces ());

262

305

Lines 319-340	Link Here

319

  return bearerId;

362

  return bearerId;

320

363

321

364

322

323

Ptr<Node>

365

Ptr<Node>

324

PointToPointEpcHelper::GetPgwNode ()

366

PointToPointEpcHelper::GetPgwNode ()

325

367

326

  return m_sgwPgw;

368

  return m_sgwPgw;

327

369

328

370

329

330

Ipv4InterfaceContainer

371

Ipv4InterfaceContainer

331

PointToPointEpcHelper::AssignUeIpv4Address (NetDeviceContainer ueDevices)

372

PointToPointEpcHelper::AssignUeIpv4Address (NetDeviceContainer ueDevices)

332

373

333

  return m_ueAddressHelper.Assign (ueDevices);

374

  return m_ueAddressHelper.Assign (ueDevices);

334

375

335

376

336

337

338

Ipv4Address

377

Ipv4Address

339

PointToPointEpcHelper::GetUeDefaultGatewayAddress ()

378

PointToPointEpcHelper::GetUeDefaultGatewayAddress ()

340

379

(-)a/src/lte/helper/point-to-point-epc-helper.h (-1 / +24 lines)

Lines 18-23	Link Here

 * Author: Jaume Nin <jnin@cttc.es>

 * Author: Jaume Nin <jnin@cttc.es>

 *         Nicola Baldo <nbaldo@cttc.es>

 *         Nicola Baldo <nbaldo@cttc.es>

 *         Manuel Requena <manuel.requena@cttc.es>

 *         Manuel Requena <manuel.requena@cttc.es>

 *         Manoj Kumar Rana <manoj24.rana@gmail.com>

*/

*/

#ifndef POINT_TO_POINT_EPC_HELPER_H

#ifndef POINT_TO_POINT_EPC_HELPER_H

Lines 68-75	Link Here

   *  \return The object TypeId.

   *  \return The object TypeId.

*/

*/

  static TypeId GetTypeId (void);

  static TypeId GetTypeId (void);

  TypeId GetInstanceTypeId () const;

  virtual void DoDispose ();

  virtual void DoDispose ();

/**

   * Get the IPv4 network address used by the EPC.

   * The EPC will use a /16 network address.

   * \returns The EPC IPv4 network address.

*/

  Ipv4Address GetEpcIpv4NetworkAddress ();

  // inherited from EpcHelper

  // inherited from EpcHelper

  virtual void AddEnb (Ptr<Node> enbNode, Ptr<NetDevice> lteEnbNetDevice, uint16_t cellId);

  virtual void AddEnb (Ptr<Node> enbNode, Ptr<NetDevice> lteEnbNetDevice, uint16_t cellId);

  virtual void AddUe (Ptr<NetDevice> ueLteDevice, uint64_t imsi);

  virtual void AddUe (Ptr<NetDevice> ueLteDevice, uint64_t imsi);

Lines 84-94	Link Here

private:

private:

/**

/**

   * helper to assign addresses to UE devices as well as to the TUN device of the SGW/PGW

   * helper to assign IPv4 addresses to UE devices as well as to the TUN device of the SGW/PGW

*/

*/

  Ipv4AddressHelper m_ueAddressHelper;

  Ipv4AddressHelper m_ueAddressHelper;

100

/**

101

/**

102

   * The common 8 bit prefix used for the IPv4 address assignment of

103

   * all the EPC networks

104

*/

105

  Ipv4Address m_uePgwBaseIpv4Prefix;

106

107

/**

108

   * The 16 bit prefix used for the IPv4 address assignment of

109

   * the UE and PGW.

110

   * The current IPv4 prefix will be the first available one in the /8 pool.

111

*/

112

  Ipv4Address m_uePgwCurrentIpv4Prefix;

113

114

/**

   * SGW-PGW network element

115

   * SGW-PGW network element

*/

116

*/

  Ptr<Node> m_sgwPgw;

117

  Ptr<Node> m_sgwPgw;

(-)a/src/lte/test/epc-test-s1u-downlink.cc (-1 / +1 lines)

Lines 153-159	Link Here

153

  Ptr<Ipv4StaticRouting> remoteHostStaticRouting = ipv4RoutingHelper.GetStaticRouting (remoteHost->GetObject<Ipv4> ());

153

  Ptr<Ipv4StaticRouting> remoteHostStaticRouting = ipv4RoutingHelper.GetStaticRouting (remoteHost->GetObject<Ipv4> ());

154

155

  // hardcoded UE addresses for now

155

  // hardcoded UE addresses for now

156

  remoteHostStaticRouting->AddNetworkRouteTo (Ipv4Address ("7.0.0.0"), Ipv4Mask ("255.255.255.0"), 1);

156

  remoteHostStaticRouting->AddNetworkRouteTo (Ipv4Address ("7.0.0.0"), Ipv4Mask ("255.255.0.0"), 1);

157

158

159

(-)a/src/lte/test/epc-test-s1u-uplink.cc (-1 / +1 lines)

Lines 370-376	Link Here

370

  Ptr<Ipv4StaticRouting> remoteHostStaticRouting = ipv4RoutingHelper.GetStaticRouting (remoteHost->GetObject<Ipv4> ());

370

  Ptr<Ipv4StaticRouting> remoteHostStaticRouting = ipv4RoutingHelper.GetStaticRouting (remoteHost->GetObject<Ipv4> ());

371

372

  // hardcoded UE addresses for now

372

  // hardcoded UE addresses for now

373

  remoteHostStaticRouting->AddNetworkRouteTo (Ipv4Address ("7.0.0.0"), Ipv4Mask ("255.255.255.0"), 1);

373

  remoteHostStaticRouting->AddNetworkRouteTo (Ipv4Address ("7.0.0.0"), Ipv4Mask ("255.255.0.0"), 1);

374

375

376

(-)a/src/lte/test/lte-test-cell-selection.cc (-1 / +1 lines)

Lines 308-314	Link Here

308

      // Routing of the Internet Host (towards the LTE network)

308

      // Routing of the Internet Host (towards the LTE network)

309

      Ipv4StaticRoutingHelper ipv4RoutingHelper;

309

      Ipv4StaticRoutingHelper ipv4RoutingHelper;

310

      Ptr<Ipv4StaticRouting> remoteHostStaticRouting = ipv4RoutingHelper.GetStaticRouting (remoteHost->GetObject<Ipv4> ());

310

      Ptr<Ipv4StaticRouting> remoteHostStaticRouting = ipv4RoutingHelper.GetStaticRouting (remoteHost->GetObject<Ipv4> ());

311

      remoteHostStaticRouting->AddNetworkRouteTo (Ipv4Address ("7.0.0.0"), Ipv4Mask ("255.0.0.0"), 1);

311

      remoteHostStaticRouting->AddNetworkRouteTo (Ipv4Address ("7.0.0.0"), Ipv4Mask ("255.255.0.0"), 1);

312

313

      // Install the IP stack on the UEs

313

      // Install the IP stack on the UEs

314

      internet.Install (ueNodes);

314

      internet.Install (ueNodes);

(-)a/src/lte/test/lte-test-cqa-ff-mac-scheduler.cc (-2 / +2 lines)

Lines 303-309	Link Here

303

304

  Ipv4StaticRoutingHelper ipv4RoutingHelper;

304

  Ipv4StaticRoutingHelper ipv4RoutingHelper;

305

  Ptr<Ipv4StaticRouting> remoteHostStaticRouting = ipv4RoutingHelper.GetStaticRouting (remoteHost->GetObject<Ipv4> ());

305

  Ptr<Ipv4StaticRouting> remoteHostStaticRouting = ipv4RoutingHelper.GetStaticRouting (remoteHost->GetObject<Ipv4> ());

306

  remoteHostStaticRouting->AddNetworkRouteTo (Ipv4Address ("7.0.0.0"), Ipv4Mask ("255.0.0.0"), 1);

306

  remoteHostStaticRouting->AddNetworkRouteTo (Ipv4Address ("7.0.0.0"), Ipv4Mask ("255.255.0.0"), 1);

307

308

  //Config::SetDefault ("ns3::LteAmc::AmcModel", EnumValue (LteAmc::PiroEW2010));

308

  //Config::SetDefault ("ns3::LteAmc::AmcModel", EnumValue (LteAmc::PiroEW2010));

309

  //Config::SetDefault ("ns3::LteAmc::Ber", DoubleValue (0.00005));

309

  //Config::SetDefault ("ns3::LteAmc::Ber", DoubleValue (0.00005));

Lines 546-552	Link Here

546

547

  Ipv4StaticRoutingHelper ipv4RoutingHelper;

547

  Ipv4StaticRoutingHelper ipv4RoutingHelper;

548

  Ptr<Ipv4StaticRouting> remoteHostStaticRouting = ipv4RoutingHelper.GetStaticRouting (remoteHost->GetObject<Ipv4> ());

548

  Ptr<Ipv4StaticRouting> remoteHostStaticRouting = ipv4RoutingHelper.GetStaticRouting (remoteHost->GetObject<Ipv4> ());

549

  remoteHostStaticRouting->AddNetworkRouteTo (Ipv4Address ("7.0.0.0"), Ipv4Mask ("255.0.0.0"), 1);

549

  remoteHostStaticRouting->AddNetworkRouteTo (Ipv4Address ("7.0.0.0"), Ipv4Mask ("255.255.0.0"), 1);

550

551

552

//   LogComponentDisableAll (LOG_LEVEL_ALL);

552

//   LogComponentDisableAll (LOG_LEVEL_ALL);

(-)a/src/lte/test/lte-test-deactivate-bearer.cc (-1 / +1 lines)

Lines 164-170	Link Here

164

165

  Ipv4StaticRoutingHelper ipv4RoutingHelper;

165

  Ipv4StaticRoutingHelper ipv4RoutingHelper;

166

  Ptr<Ipv4StaticRouting> remoteHostStaticRouting = ipv4RoutingHelper.GetStaticRouting (remoteHost->GetObject<Ipv4> ());

166

  Ptr<Ipv4StaticRouting> remoteHostStaticRouting = ipv4RoutingHelper.GetStaticRouting (remoteHost->GetObject<Ipv4> ());

167

  remoteHostStaticRouting->AddNetworkRouteTo (Ipv4Address ("7.0.0.0"), Ipv4Mask ("255.0.0.0"), 1);

167

  remoteHostStaticRouting->AddNetworkRouteTo (Ipv4Address ("7.0.0.0"), Ipv4Mask ("255.255.0.0"), 1);

168

169

  // LogLevel logLevel = (LogLevel)(LOG_PREFIX_FUNC | LOG_PREFIX_TIME | LOG_LEVEL_ALL);

169

  // LogLevel logLevel = (LogLevel)(LOG_PREFIX_FUNC | LOG_PREFIX_TIME | LOG_LEVEL_ALL);

170

(-)a/src/lte/test/lte-test-fdtbfq-ff-mac-scheduler.cc (-2 / +2 lines)

Lines 299-305	Link Here

299

300

  Ipv4StaticRoutingHelper ipv4RoutingHelper;

300

  Ipv4StaticRoutingHelper ipv4RoutingHelper;

301

  Ptr<Ipv4StaticRouting> remoteHostStaticRouting = ipv4RoutingHelper.GetStaticRouting (remoteHost->GetObject<Ipv4> ());

301

  Ptr<Ipv4StaticRouting> remoteHostStaticRouting = ipv4RoutingHelper.GetStaticRouting (remoteHost->GetObject<Ipv4> ());

302

  remoteHostStaticRouting->AddNetworkRouteTo (Ipv4Address ("7.0.0.0"), Ipv4Mask ("255.0.0.0"), 1);

302

  remoteHostStaticRouting->AddNetworkRouteTo (Ipv4Address ("7.0.0.0"), Ipv4Mask ("255.255.0.0"), 1);

303

304

  //Config::SetDefault ("ns3::LteAmc::AmcModel", EnumValue (LteAmc::PiroEW2010));

304

  //Config::SetDefault ("ns3::LteAmc::AmcModel", EnumValue (LteAmc::PiroEW2010));

305

  //Config::SetDefault ("ns3::LteAmc::Ber", DoubleValue (0.00005));

305

  //Config::SetDefault ("ns3::LteAmc::Ber", DoubleValue (0.00005));

Lines 545-551	Link Here

545

546

  Ipv4StaticRoutingHelper ipv4RoutingHelper;

546

  Ipv4StaticRoutingHelper ipv4RoutingHelper;

547

  Ptr<Ipv4StaticRouting> remoteHostStaticRouting = ipv4RoutingHelper.GetStaticRouting (remoteHost->GetObject<Ipv4> ());

547

  Ptr<Ipv4StaticRouting> remoteHostStaticRouting = ipv4RoutingHelper.GetStaticRouting (remoteHost->GetObject<Ipv4> ());

548

  remoteHostStaticRouting->AddNetworkRouteTo (Ipv4Address ("7.0.0.0"), Ipv4Mask ("255.0.0.0"), 1);

548

  remoteHostStaticRouting->AddNetworkRouteTo (Ipv4Address ("7.0.0.0"), Ipv4Mask ("255.255.0.0"), 1);

549

550

551

//   LogComponentDisableAll (LOG_LEVEL_ALL);

551

//   LogComponentDisableAll (LOG_LEVEL_ALL);

(-)a/src/lte/test/lte-test-frequency-reuse.cc (-1 / +1 lines)

Lines 1464-1470	Link Here

1464

  Ipv4StaticRoutingHelper ipv4RoutingHelper;

1464

  Ipv4StaticRoutingHelper ipv4RoutingHelper;

1465

  Ptr<Ipv4StaticRouting> remoteHostStaticRouting = ipv4RoutingHelper.GetStaticRouting (remoteHost->GetObject<Ipv4> ());

1465

  Ptr<Ipv4StaticRouting> remoteHostStaticRouting = ipv4RoutingHelper.GetStaticRouting (remoteHost->GetObject<Ipv4> ());

1466

  // interface 0 is localhost, 1 is the p2p device

1466

  // interface 0 is localhost, 1 is the p2p device

1467

  remoteHostStaticRouting->AddNetworkRouteTo (Ipv4Address ("7.0.0.0"), Ipv4Mask ("255.0.0.0"), 1);

1467

  remoteHostStaticRouting->AddNetworkRouteTo (Ipv4Address ("7.0.0.0"), Ipv4Mask ("255.255.0.0"), 1);

1468

1469

  // Create Nodes: eNodeB and UE

1469

  // Create Nodes: eNodeB and UE

1470

  NodeContainer enbNodes;

1470

  NodeContainer enbNodes;

(-)a/src/lte/test/lte-test-pss-ff-mac-scheduler.cc (-2 / +2 lines)

Lines 300-306	Link Here

300

301

  Ipv4StaticRoutingHelper ipv4RoutingHelper;

301

  Ipv4StaticRoutingHelper ipv4RoutingHelper;

302

  Ptr<Ipv4StaticRouting> remoteHostStaticRouting = ipv4RoutingHelper.GetStaticRouting (remoteHost->GetObject<Ipv4> ());

302

  Ptr<Ipv4StaticRouting> remoteHostStaticRouting = ipv4RoutingHelper.GetStaticRouting (remoteHost->GetObject<Ipv4> ());

303

  remoteHostStaticRouting->AddNetworkRouteTo (Ipv4Address ("7.0.0.0"), Ipv4Mask ("255.0.0.0"), 1);

303

  remoteHostStaticRouting->AddNetworkRouteTo (Ipv4Address ("7.0.0.0"), Ipv4Mask ("255.255.0.0"), 1);

304

305

  //Config::SetDefault ("ns3::LteAmc::AmcModel", EnumValue (LteAmc::PiroEW2010));

305

  //Config::SetDefault ("ns3::LteAmc::AmcModel", EnumValue (LteAmc::PiroEW2010));

306

  //Config::SetDefault ("ns3::LteAmc::Ber", DoubleValue (0.00005));

306

  //Config::SetDefault ("ns3::LteAmc::Ber", DoubleValue (0.00005));

Lines 546-552	Link Here

546

547

  Ipv4StaticRoutingHelper ipv4RoutingHelper;

547

  Ipv4StaticRoutingHelper ipv4RoutingHelper;

548

  Ptr<Ipv4StaticRouting> remoteHostStaticRouting = ipv4RoutingHelper.GetStaticRouting (remoteHost->GetObject<Ipv4> ());

548

  Ptr<Ipv4StaticRouting> remoteHostStaticRouting = ipv4RoutingHelper.GetStaticRouting (remoteHost->GetObject<Ipv4> ());

549

  remoteHostStaticRouting->AddNetworkRouteTo (Ipv4Address ("7.0.0.0"), Ipv4Mask ("255.0.0.0"), 1);

549

  remoteHostStaticRouting->AddNetworkRouteTo (Ipv4Address ("7.0.0.0"), Ipv4Mask ("255.255.0.0"), 1);

550

551

552

//   LogComponentDisableAll (LOG_LEVEL_ALL);

552

//   LogComponentDisableAll (LOG_LEVEL_ALL);

(-)a/src/lte/test/lte-test-tdtbfq-ff-mac-scheduler.cc (-2 / +2 lines)

Lines 299-305	Link Here

299

300

  Ipv4StaticRoutingHelper ipv4RoutingHelper;

300

  Ipv4StaticRoutingHelper ipv4RoutingHelper;

301

  Ptr<Ipv4StaticRouting> remoteHostStaticRouting = ipv4RoutingHelper.GetStaticRouting (remoteHost->GetObject<Ipv4> ());

301

  Ptr<Ipv4StaticRouting> remoteHostStaticRouting = ipv4RoutingHelper.GetStaticRouting (remoteHost->GetObject<Ipv4> ());

302

  remoteHostStaticRouting->AddNetworkRouteTo (Ipv4Address ("7.0.0.0"), Ipv4Mask ("255.0.0.0"), 1);

302

  remoteHostStaticRouting->AddNetworkRouteTo (Ipv4Address ("7.0.0.0"), Ipv4Mask ("255.255.0.0"), 1);

303

304

  //Config::SetDefault ("ns3::LteAmc::AmcModel", EnumValue (LteAmc::PiroEW2010));

304

  //Config::SetDefault ("ns3::LteAmc::AmcModel", EnumValue (LteAmc::PiroEW2010));

305

  //Config::SetDefault ("ns3::LteAmc::Ber", DoubleValue (0.00005));

305

  //Config::SetDefault ("ns3::LteAmc::Ber", DoubleValue (0.00005));

Lines 545-551	Link Here

545

546

  Ipv4StaticRoutingHelper ipv4RoutingHelper;

546

  Ipv4StaticRoutingHelper ipv4RoutingHelper;

547

  Ptr<Ipv4StaticRouting> remoteHostStaticRouting = ipv4RoutingHelper.GetStaticRouting (remoteHost->GetObject<Ipv4> ());

547

  Ptr<Ipv4StaticRouting> remoteHostStaticRouting = ipv4RoutingHelper.GetStaticRouting (remoteHost->GetObject<Ipv4> ());

548

  remoteHostStaticRouting->AddNetworkRouteTo (Ipv4Address ("7.0.0.0"), Ipv4Mask ("255.0.0.0"), 1);

548

  remoteHostStaticRouting->AddNetworkRouteTo (Ipv4Address ("7.0.0.0"), Ipv4Mask ("255.255.0.0"), 1);

549

550

551

//   LogComponentDisableAll (LOG_LEVEL_ALL);

551

//   LogComponentDisableAll (LOG_LEVEL_ALL);

(-)a/src/lte/test/lte-test-ue-measurements.cc (-1 / +1 lines)

Lines 1744-1750	Link Here

1744

  // Routing of the Internet Host (towards the LTE network)

1744

  // Routing of the Internet Host (towards the LTE network)

1745

  Ipv4StaticRoutingHelper ipv4RoutingHelper;

1745

  Ipv4StaticRoutingHelper ipv4RoutingHelper;

1746

  Ptr<Ipv4StaticRouting> remoteHostStaticRouting = ipv4RoutingHelper.GetStaticRouting (remoteHost->GetObject<Ipv4> ());

1746

  Ptr<Ipv4StaticRouting> remoteHostStaticRouting = ipv4RoutingHelper.GetStaticRouting (remoteHost->GetObject<Ipv4> ());

1747

  remoteHostStaticRouting->AddNetworkRouteTo (Ipv4Address ("7.0.0.0"), Ipv4Mask ("255.0.0.0"), 1);

1747

  remoteHostStaticRouting->AddNetworkRouteTo (Ipv4Address ("7.0.0.0"), Ipv4Mask ("255.255.0.0"), 1);

1748

1749

  // Enable layer-3 filtering

1749

  // Enable layer-3 filtering

1750

  Config::SetDefault ("ns3::LteEnbRrc::RsrpFilterCoefficient",

1750

  Config::SetDefault ("ns3::LteEnbRrc::RsrpFilterCoefficient",

(-)a/src/lte/test/test-lte-epc-e2e-data.cc (-1 / +1 lines)

Lines 177-183	Link Here

177

  Ptr<Ipv4StaticRouting> remoteHostStaticRouting = ipv4RoutingHelper.GetStaticRouting (remoteHost->GetObject<Ipv4> ());

177

  Ptr<Ipv4StaticRouting> remoteHostStaticRouting = ipv4RoutingHelper.GetStaticRouting (remoteHost->GetObject<Ipv4> ());

178

179

  // hardcoded UE addresses for now

179

  // hardcoded UE addresses for now

180

  remoteHostStaticRouting->AddNetworkRouteTo (Ipv4Address ("7.0.0.0"), Ipv4Mask ("255.255.255.0"), 1);

180

  remoteHostStaticRouting->AddNetworkRouteTo (Ipv4Address ("7.0.0.0"), Ipv4Mask ("255.255.0.0"), 1);

181

182

183

  NodeContainer enbs;

183

  NodeContainer enbs;

(-)a/src/lte/test/test-lte-handover-target.cc (-1 / +1 lines)

Lines 318-324	Link Here

318

  // Routing of the Internet Host (towards the LTE network)

318

  // Routing of the Internet Host (towards the LTE network)

319

  Ipv4StaticRoutingHelper ipv4RoutingHelper;

319

  Ipv4StaticRoutingHelper ipv4RoutingHelper;

320

  Ptr<Ipv4StaticRouting> remoteHostStaticRouting = ipv4RoutingHelper.GetStaticRouting (remoteHost->GetObject<Ipv4> ());

320

  Ptr<Ipv4StaticRouting> remoteHostStaticRouting = ipv4RoutingHelper.GetStaticRouting (remoteHost->GetObject<Ipv4> ());

321

  remoteHostStaticRouting->AddNetworkRouteTo (Ipv4Address ("7.0.0.0"), Ipv4Mask ("255.0.0.0"), 1);

321

  remoteHostStaticRouting->AddNetworkRouteTo (Ipv4Address ("7.0.0.0"), Ipv4Mask ("255.255.0.0"), 1);

322

323

  // Create Devices and install them in the Nodes (eNB and UE)

323

  // Create Devices and install them in the Nodes (eNB and UE)

324

  NetDeviceContainer enbDevs;

324

  NetDeviceContainer enbDevs;

(-)a/src/lte/test/test-lte-x2-handover.cc (-1 / +1 lines)

Lines 280-286	Link Here

280

281

      Ipv4StaticRoutingHelper ipv4RoutingHelper;

281

      Ipv4StaticRoutingHelper ipv4RoutingHelper;

282

      Ptr<Ipv4StaticRouting> remoteHostStaticRouting = ipv4RoutingHelper.GetStaticRouting (remoteHost->GetObject<Ipv4> ());

282

      Ptr<Ipv4StaticRouting> remoteHostStaticRouting = ipv4RoutingHelper.GetStaticRouting (remoteHost->GetObject<Ipv4> ());

283

      remoteHostStaticRouting->AddNetworkRouteTo (Ipv4Address ("7.0.0.0"), Ipv4Mask ("255.0.0.0"), 1);

283

      remoteHostStaticRouting->AddNetworkRouteTo (Ipv4Address ("7.0.0.0"), Ipv4Mask ("255.255.0.0"), 1);

284

285

      // Install the IP stack on the UEs

285

      // Install the IP stack on the UEs

286

      internet.Install (ueNodes);

286

      internet.Install (ueNodes);

Return to bug 2835