From e472686e64ebcee45d4d3cd8bb0fbef34520214a Mon Sep 17 00:00:00 2001 From: Davide Magrin Date: Mon, 14 Oct 2019 16:41:35 +0200 Subject: [PATCH] lte: Include LogComponentEnable statements for new classes see merge request nsnam/ns-3-dev!116 --- src/lte/examples/lena-deactivate-bearer.cc | 6 +++--- src/lte/examples/lena-x2-handover-measures.cc | 4 +++- src/lte/examples/lena-x2-handover.cc | 4 +++- src/lte/helper/epc-helper.h | 2 -- src/lte/helper/lte-helper.cc | 5 +++-- src/lte/test/lte-test-deactivate-bearer.cc | 5 +++-- 6 files changed, 15 insertions(+), 11 deletions(-) diff --git a/src/lte/examples/lena-deactivate-bearer.cc b/src/lte/examples/lena-deactivate-bearer.cc index 702e588be..41c1cb364 100644 --- a/src/lte/examples/lena-deactivate-bearer.cc +++ b/src/lte/examples/lena-deactivate-bearer.cc @@ -76,8 +76,9 @@ main (int argc, char *argv[]) LogComponentEnable ("LteHelper", logLevel); LogComponentEnable ("EpcHelper", logLevel); LogComponentEnable ("EpcEnbApplication", logLevel); - LogComponentEnable ("EpcSgwPgwApplication", logLevel); - LogComponentEnable ("EpcMme", logLevel); + LogComponentEnable ("EpcMmeApplication", logLevel); + LogComponentEnable ("EpcPgwApplication", logLevel); + LogComponentEnable ("EpcSgwApplication", logLevel); LogComponentEnable ("LteEnbRrc", logLevel); @@ -235,4 +236,3 @@ main (int argc, char *argv[]) return 0; } - diff --git a/src/lte/examples/lena-x2-handover-measures.cc b/src/lte/examples/lena-x2-handover-measures.cc index c77453a20..993b8f6fe 100644 --- a/src/lte/examples/lena-x2-handover-measures.cc +++ b/src/lte/examples/lena-x2-handover-measures.cc @@ -129,8 +129,10 @@ main (int argc, char *argv[]) // LogComponentEnable ("LteHelper", logLevel); // LogComponentEnable ("EpcHelper", logLevel); // LogComponentEnable ("EpcEnbApplication", logLevel); + // LogComponentEnable ("EpcMmeApplication", logLevel); + // LogComponentEnable ("EpcPgwApplication", logLevel); + // LogComponentEnable ("EpcSgwApplication", logLevel); // LogComponentEnable ("EpcX2", logLevel); - // LogComponentEnable ("EpcSgwPgwApplication", logLevel); // LogComponentEnable ("LteEnbRrc", logLevel); // LogComponentEnable ("LteEnbNetDevice", logLevel); diff --git a/src/lte/examples/lena-x2-handover.cc b/src/lte/examples/lena-x2-handover.cc index bc087b4bf..7aa902c64 100644 --- a/src/lte/examples/lena-x2-handover.cc +++ b/src/lte/examples/lena-x2-handover.cc @@ -127,8 +127,10 @@ main (int argc, char *argv[]) // LogComponentEnable ("LteHelper", logLevel); // LogComponentEnable ("EpcHelper", logLevel); // LogComponentEnable ("EpcEnbApplication", logLevel); + // LogComponentEnable ("EpcMmeApplication", logLevel); + // LogComponentEnable ("EpcPgwApplication", logLevel); + // LogComponentEnable ("EpcSgwApplication", logLevel); // LogComponentEnable ("EpcX2", logLevel); - // LogComponentEnable ("EpcSgwPgwApplication", logLevel); // LogComponentEnable ("LteEnbRrc", logLevel); // LogComponentEnable ("LteEnbNetDevice", logLevel); diff --git a/src/lte/helper/epc-helper.h b/src/lte/helper/epc-helper.h index 6efbec2e5..74411d7ff 100644 --- a/src/lte/helper/epc-helper.h +++ b/src/lte/helper/epc-helper.h @@ -35,9 +35,7 @@ namespace ns3 { class Node; class NetDevice; class VirtualNetDevice; -class EpcSgwPgwApplication; class EpcX2; -class EpcMme; /** * \ingroup lte diff --git a/src/lte/helper/lte-helper.cc b/src/lte/helper/lte-helper.cc index 9bd53981e..52f55b6aa 100644 --- a/src/lte/helper/lte-helper.cc +++ b/src/lte/helper/lte-helper.cc @@ -1335,8 +1335,9 @@ LteHelper::EnableLogComponents (void) LogComponentEnable ("ComponentCarrierUe", LOG_LEVEL_ALL); LogComponentEnable ("CqaFfMacScheduler", LOG_LEVEL_ALL); LogComponentEnable ("EpcEnbApplication", LOG_LEVEL_ALL); - LogComponentEnable ("EpcMme", LOG_LEVEL_ALL); - LogComponentEnable ("EpcSgwPgwApplication", LOG_LEVEL_ALL); + LogComponentEnable ("EpcMmeApplication", LOG_LEVEL_ALL); + LogComponentEnable ("EpcPgwApplication", LOG_LEVEL_ALL); + LogComponentEnable ("EpcSgwApplication", LOG_LEVEL_ALL); LogComponentEnable ("EpcTft", LOG_LEVEL_ALL); LogComponentEnable ("EpcTftClassifier", LOG_LEVEL_ALL); LogComponentEnable ("EpcUeNas", LOG_LEVEL_ALL); diff --git a/src/lte/test/lte-test-deactivate-bearer.cc b/src/lte/test/lte-test-deactivate-bearer.cc index c1504b8fb..4854d3375 100644 --- a/src/lte/test/lte-test-deactivate-bearer.cc +++ b/src/lte/test/lte-test-deactivate-bearer.cc @@ -172,8 +172,9 @@ LenaDeactivateBearerTestCase::DoRun (void) // LogComponentEnable ("LteHelper", logLevel); // LogComponentEnable ("EpcHelper", logLevel); // LogComponentEnable ("EpcEnbApplication", logLevel); - // LogComponentEnable ("EpcSgwPgwApplication", logLevel); - // LogComponentEnable ("EpcMme", logLevel); + // LogComponentEnable ("EpcMmeApplication", logLevel); + // LogComponentEnable ("EpcPgwApplication", logLevel); + // LogComponentEnable ("EpcSgwApplication", logLevel); // LogComponentEnable ("LteEnbRrc", logLevel); lteHelper->SetAttribute ("PathlossModel", StringValue ("ns3::FriisSpectrumPropagationLossModel"));