Attachment #2932 for bug #2798

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

(-)a/src/lte/test/lte-test-fdbet-ff-mac-scheduler.cc (+10 lines)

Lines 239-244 LenaFdBetFfMacSchedulerTestCase1::DoRun (void)	Link Here

239

  NetDeviceContainer enbDevs;

239

  NetDeviceContainer enbDevs;

240

  NetDeviceContainer ueDevs;

240

  NetDeviceContainer ueDevs;

241

  lteHelper->SetSchedulerType ("ns3::FdBetFfMacScheduler");

241

  lteHelper->SetSchedulerType ("ns3::FdBetFfMacScheduler");

242

243

  // set DL and UL bandwidth

244

  lteHelper->SetEnbDeviceAttribute ("DlBandwidth", UintegerValue (25));

245

  lteHelper->SetEnbDeviceAttribute ("UlBandwidth", UintegerValue (25));

246

242

  enbDevs = lteHelper->InstallEnbDevice (enbNodes);

247

  enbDevs = lteHelper->InstallEnbDevice (enbNodes);

243

  ueDevs = lteHelper->InstallUeDevice (ueNodes);

248

  ueDevs = lteHelper->InstallUeDevice (ueNodes);

244

249

Lines 403-408 LenaFdBetFfMacSchedulerTestCase2::DoRun (void)	Link Here

403

  NetDeviceContainer enbDevs;

408

  NetDeviceContainer enbDevs;

404

  NetDeviceContainer ueDevs;

409

  NetDeviceContainer ueDevs;

405

  lteHelper->SetSchedulerType ("ns3::FdBetFfMacScheduler");

410

  lteHelper->SetSchedulerType ("ns3::FdBetFfMacScheduler");

411

412

  // set DL and UL bandwidth

413

  lteHelper->SetEnbDeviceAttribute ("DlBandwidth", UintegerValue (25));

414

  lteHelper->SetEnbDeviceAttribute ("UlBandwidth", UintegerValue (25));

415

406

  enbDevs = lteHelper->InstallEnbDevice (enbNodes);

416

  enbDevs = lteHelper->InstallEnbDevice (enbNodes);

407

  ueDevs = lteHelper->InstallUeDevice (ueNodes);

417

  ueDevs = lteHelper->InstallUeDevice (ueNodes);

408

418

(-)a/src/lte/test/lte-test-fdmt-ff-mac-scheduler.cc (+5 lines)

Lines 223-228 LenaFdMtFfMacSchedulerTestCase::DoRun (void)	Link Here

223

  NetDeviceContainer enbDevs;

223

  NetDeviceContainer enbDevs;

224

  NetDeviceContainer ueDevs;

224

  NetDeviceContainer ueDevs;

225

  lteHelper->SetSchedulerType ("ns3::FdMtFfMacScheduler");

225

  lteHelper->SetSchedulerType ("ns3::FdMtFfMacScheduler");

226

227

  // set DL and UL bandwidth

228

  lteHelper->SetEnbDeviceAttribute ("DlBandwidth", UintegerValue (25));

229

  lteHelper->SetEnbDeviceAttribute ("UlBandwidth", UintegerValue (25));

230

226

  enbDevs = lteHelper->InstallEnbDevice (enbNodes);

231

  enbDevs = lteHelper->InstallEnbDevice (enbNodes);

227

  ueDevs = lteHelper->InstallUeDevice (ueNodes);

232

  ueDevs = lteHelper->InstallUeDevice (ueNodes);

228

233

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

Lines 298-303 LteHardFrTestCase::DoRun (void)	Link Here

298

  NetDeviceContainer enbDevs;

298

  NetDeviceContainer enbDevs;

299

  NetDeviceContainer ueDevs;

299

  NetDeviceContainer ueDevs;

300

  lteHelper->SetSchedulerType (m_schedulerType);

300

  lteHelper->SetSchedulerType (m_schedulerType);

301

302

  // set DL and UL bandwidth

303

  lteHelper->SetEnbDeviceAttribute ("DlBandwidth", UintegerValue (25));

304

  lteHelper->SetEnbDeviceAttribute ("UlBandwidth", UintegerValue (25));

305

301

  enbDevs = lteHelper->InstallEnbDevice (enbNodes);

306

  enbDevs = lteHelper->InstallEnbDevice (enbNodes);

302

  ueDevs = lteHelper->InstallUeDevice (ueNodes);

307

  ueDevs = lteHelper->InstallUeDevice (ueNodes);

303

308

Lines 407-412 LteStrictFrTestCase::DoRun (void)	Link Here

407

  NetDeviceContainer enbDevs;

412

  NetDeviceContainer enbDevs;

408

  NetDeviceContainer ueDevs;

413

  NetDeviceContainer ueDevs;

409

  lteHelper->SetSchedulerType (m_schedulerType);

414

  lteHelper->SetSchedulerType (m_schedulerType);

415

416

  // set DL and UL bandwidth

417

  lteHelper->SetEnbDeviceAttribute ("DlBandwidth", UintegerValue (25));

418

  lteHelper->SetEnbDeviceAttribute ("UlBandwidth", UintegerValue (25));

419

410

  enbDevs = lteHelper->InstallEnbDevice (enbNodes);

420

  enbDevs = lteHelper->InstallEnbDevice (enbNodes);

411

  ueDevs = lteHelper->InstallUeDevice (ueNodes);

421

  ueDevs = lteHelper->InstallUeDevice (ueNodes);

412

422

Lines 669-674 LteStrictFrAreaTestCase::DoRun (void)	Link Here

669

  NetDeviceContainer ueDevs2;

679

  NetDeviceContainer ueDevs2;

670

  lteHelper->SetSchedulerType (m_schedulerType);

680

  lteHelper->SetSchedulerType (m_schedulerType);

671

681

682

  // set DL and UL bandwidth

683

  lteHelper->SetEnbDeviceAttribute ("DlBandwidth", UintegerValue (25));

684

  lteHelper->SetEnbDeviceAttribute ("UlBandwidth", UintegerValue (25));

685

672

  lteHelper->SetFfrAlgorithmType ("ns3::LteFrStrictAlgorithm");

686

  lteHelper->SetFfrAlgorithmType ("ns3::LteFrStrictAlgorithm");

673

  lteHelper->SetFfrAlgorithmAttribute ("RsrqThreshold", UintegerValue (25));

687

  lteHelper->SetFfrAlgorithmAttribute ("RsrqThreshold", UintegerValue (25));

674

  lteHelper->SetFfrAlgorithmAttribute ("CenterPowerOffset",

688

  lteHelper->SetFfrAlgorithmAttribute ("CenterPowerOffset",

Lines 846-851 LteSoftFrAreaTestCase::DoRun (void)	Link Here

846

  NetDeviceContainer ueDevs2;

860

  NetDeviceContainer ueDevs2;

847

  lteHelper->SetSchedulerType (m_schedulerType);

861

  lteHelper->SetSchedulerType (m_schedulerType);

848

862

863

  // set DL and UL bandwidth

864

  lteHelper->SetEnbDeviceAttribute ("DlBandwidth", UintegerValue (25));

865

  lteHelper->SetEnbDeviceAttribute ("UlBandwidth", UintegerValue (25));

866

849

  lteHelper->SetFfrAlgorithmType ("ns3::LteFrSoftAlgorithm");

867

  lteHelper->SetFfrAlgorithmType ("ns3::LteFrSoftAlgorithm");

850

  lteHelper->SetFfrAlgorithmAttribute ("AllowCenterUeUseEdgeSubBand", BooleanValue (false));

868

  lteHelper->SetFfrAlgorithmAttribute ("AllowCenterUeUseEdgeSubBand", BooleanValue (false));

851

  lteHelper->SetFfrAlgorithmAttribute ("RsrqThreshold", UintegerValue (25));

869

  lteHelper->SetFfrAlgorithmAttribute ("RsrqThreshold", UintegerValue (25));

Lines 1029-1034 LteSoftFfrAreaTestCase::DoRun (void)	Link Here

1029

  NetDeviceContainer ueDevs2;

1047

  NetDeviceContainer ueDevs2;

1030

  lteHelper->SetSchedulerType (m_schedulerType);

1048

  lteHelper->SetSchedulerType (m_schedulerType);

1031

1049

1050

  // set DL and UL bandwidth

1051

  lteHelper->SetEnbDeviceAttribute ("DlBandwidth", UintegerValue (25));

1052

  lteHelper->SetEnbDeviceAttribute ("UlBandwidth", UintegerValue (25));

1053

1032

  lteHelper->SetFfrAlgorithmType ("ns3::LteFfrSoftAlgorithm");

1054

  lteHelper->SetFfrAlgorithmType ("ns3::LteFfrSoftAlgorithm");

1033

  lteHelper->SetFfrAlgorithmAttribute ("CenterRsrqThreshold", UintegerValue (28));

1055

  lteHelper->SetFfrAlgorithmAttribute ("CenterRsrqThreshold", UintegerValue (28));

1034

  lteHelper->SetFfrAlgorithmAttribute ("EdgeRsrqThreshold", UintegerValue (18));

1056

  lteHelper->SetFfrAlgorithmAttribute ("EdgeRsrqThreshold", UintegerValue (18));

(-)a/src/lte/test/lte-test-harq.cc (+3 lines)

Lines 193-198 LenaHarqTestCase::DoRun (void)	Link Here

193

  lena->SetSchedulerType ("ns3::RrFfMacScheduler");

193

  lena->SetSchedulerType ("ns3::RrFfMacScheduler");

194

  lena->SetSchedulerAttribute ("UlCqiFilter", EnumValue (FfMacScheduler::PUSCH_UL_CQI));

194

  lena->SetSchedulerAttribute ("UlCqiFilter", EnumValue (FfMacScheduler::PUSCH_UL_CQI));

195

196

  // set DL bandwidth.

197

  lena->SetEnbDeviceAttribute ("DlBandwidth", UintegerValue (25));

198

196

  enbDevs = lena->InstallEnbDevice (enbNodes);

199

  enbDevs = lena->InstallEnbDevice (enbNodes);

197

  ueDevs = lena->InstallUeDevice (ueNodes);

200

  ueDevs = lena->InstallUeDevice (ueNodes);

198

201

(-)a/src/lte/test/lte-test-interference-fr.cc (+12 lines)

Lines 112-117 LteInterferenceHardFrTestCase::DoRun (void)	Link Here

112

113

  lteHelper->SetAttribute ("PathlossModel", StringValue ("ns3::FriisSpectrumPropagationLossModel"));

113

  lteHelper->SetAttribute ("PathlossModel", StringValue ("ns3::FriisSpectrumPropagationLossModel"));

114

115

  // set DL and UL bandwidth

116

  lteHelper->SetEnbDeviceAttribute ("DlBandwidth", UintegerValue (25));

117

  lteHelper->SetEnbDeviceAttribute ("UlBandwidth", UintegerValue (25));

118

115

  // Create Nodes: eNodeB and UE

119

  // Create Nodes: eNodeB and UE

116

  NodeContainer enbNodes;

120

  NodeContainer enbNodes;

117

  NodeContainer ueNodes1;

121

  NodeContainer ueNodes1;

Lines 280-285 LteInterferenceStrictFrTestCase::DoRun (void)	Link Here

280

284

281

  lteHelper->SetAttribute ("PathlossModel", StringValue ("ns3::FriisSpectrumPropagationLossModel"));

285

  lteHelper->SetAttribute ("PathlossModel", StringValue ("ns3::FriisSpectrumPropagationLossModel"));

282

286

287

  // set DL and UL bandwidth

288

  lteHelper->SetEnbDeviceAttribute ("DlBandwidth", UintegerValue (25));

289

  lteHelper->SetEnbDeviceAttribute ("UlBandwidth", UintegerValue (25));

290

283

  // Create Nodes: eNodeB and UE

291

  // Create Nodes: eNodeB and UE

284

  NodeContainer enbNodes;

292

  NodeContainer enbNodes;

285

  NodeContainer ueNodes1;

293

  NodeContainer ueNodes1;

Lines 319-324 LteInterferenceStrictFrTestCase::DoRun (void)	Link Here

319

  lteHelper->SetSchedulerType ("ns3::PfFfMacScheduler");

327

  lteHelper->SetSchedulerType ("ns3::PfFfMacScheduler");

320

  lteHelper->SetSchedulerAttribute ("UlCqiFilter", EnumValue (FfMacScheduler::PUSCH_UL_CQI));

328

  lteHelper->SetSchedulerAttribute ("UlCqiFilter", EnumValue (FfMacScheduler::PUSCH_UL_CQI));

321

329

330

  // set DL and UL bandwidth

331

  lteHelper->SetEnbDeviceAttribute ("DlBandwidth", UintegerValue (25));

332

  lteHelper->SetEnbDeviceAttribute ("UlBandwidth", UintegerValue (25));

333

322

334

323

  lteHelper->SetFfrAlgorithmAttribute ("DlCommonSubBandwidth", UintegerValue (12));

335

  lteHelper->SetFfrAlgorithmAttribute ("DlCommonSubBandwidth", UintegerValue (12));

324

  lteHelper->SetFfrAlgorithmAttribute ("DlEdgeSubBandOffset", UintegerValue (0));

336

  lteHelper->SetFfrAlgorithmAttribute ("DlEdgeSubBandOffset", UintegerValue (0));

(-)a/src/lte/test/lte-test-interference.cc (+5 lines)

Lines 159-164 LteInterferenceTestCase::DoRun (void)	Link Here

159

  NetDeviceContainer ueDevs2;

159

  NetDeviceContainer ueDevs2;

160

  lteHelper->SetSchedulerType ("ns3::RrFfMacScheduler");

160

  lteHelper->SetSchedulerType ("ns3::RrFfMacScheduler");

161

  lteHelper->SetSchedulerAttribute ("UlCqiFilter", EnumValue (FfMacScheduler::PUSCH_UL_CQI));

161

  lteHelper->SetSchedulerAttribute ("UlCqiFilter", EnumValue (FfMacScheduler::PUSCH_UL_CQI));

162

163

  // set DL and UL bandwidth

164

  lteHelper->SetEnbDeviceAttribute ("DlBandwidth", UintegerValue (25));

165

  lteHelper->SetEnbDeviceAttribute ("UlBandwidth", UintegerValue (25));

166

162

  enbDevs = lteHelper->InstallEnbDevice (enbNodes);

167

  enbDevs = lteHelper->InstallEnbDevice (enbNodes);

163

  ueDevs1 = lteHelper->InstallUeDevice (ueNodes1);

168

  ueDevs1 = lteHelper->InstallUeDevice (ueNodes1);

164

  ueDevs2 = lteHelper->InstallUeDevice (ueNodes2);

169

  ueDevs2 = lteHelper->InstallUeDevice (ueNodes2);

(-)a/src/lte/test/lte-test-link-adaptation.cc (+3 lines)

Lines 176-181 LteLinkAdaptationTestCase::DoRun (void)	Link Here

176

  NS_LOG_INFO ("SNR = " << m_snrDb << "  LOSS = " << m_loss);

176

  NS_LOG_INFO ("SNR = " << m_snrDb << "  LOSS = " << m_loss);

177

  lteHelper->SetPathlossModelAttribute ("Loss", DoubleValue (m_loss));

177

  lteHelper->SetPathlossModelAttribute ("Loss", DoubleValue (m_loss));

178

179

  // set DL bandwidth.

180

  lteHelper->SetEnbDeviceAttribute ("DlBandwidth", UintegerValue (25));

181

179

  // Create Nodes: eNodeB and UE

182

  // Create Nodes: eNodeB and UE

180

  NodeContainer enbNodes;

183

  NodeContainer enbNodes;

181

  NodeContainer ueNodes;

184

  NodeContainer ueNodes;

(-)a/src/lte/test/lte-test-mimo.cc (+5 lines)

Lines 140-145 LenaMimoTestCase::DoRun (void)	Link Here

140

  lteHelper->SetPathlossModelAttribute ("ShadowSigmaIndoor", DoubleValue (0.0));

140

  lteHelper->SetPathlossModelAttribute ("ShadowSigmaIndoor", DoubleValue (0.0));

141

  lteHelper->SetPathlossModelAttribute ("ShadowSigmaExtWalls", DoubleValue (0.0));

141

  lteHelper->SetPathlossModelAttribute ("ShadowSigmaExtWalls", DoubleValue (0.0));

142

143

144

  // set DL and UL bandwidth

145

  lteHelper->SetEnbDeviceAttribute ("DlBandwidth", UintegerValue (25));

146

  lteHelper->SetEnbDeviceAttribute ("UlBandwidth", UintegerValue (25));

147

143

//   lteHelper->EnableLogComponents ();

148

//   lteHelper->EnableLogComponents ();

144

149

145

  // Create Nodes: eNodeB and UE

150

  // Create Nodes: eNodeB and UE

(-)a/src/lte/test/lte-test-pathloss-model.cc (+2 lines)

Lines 216-221 LtePathlossModelSystemTestCase::DoRun (void)	Link Here

216

  lteHelper->SetEnbDeviceAttribute ("DlEarfcn", UintegerValue (200));

216

  lteHelper->SetEnbDeviceAttribute ("DlEarfcn", UintegerValue (200));

217

  lteHelper->SetEnbDeviceAttribute ("UlEarfcn", UintegerValue (18200));

217

  lteHelper->SetEnbDeviceAttribute ("UlEarfcn", UintegerValue (18200));

218

  lteHelper->SetUeDeviceAttribute ("DlEarfcn", UintegerValue (200));

218

  lteHelper->SetUeDeviceAttribute ("DlEarfcn", UintegerValue (200));

219

  // set DL bandwidth. This is important because it changes the value of the noise power in the SINR

220

  lteHelper->SetEnbDeviceAttribute ("DlBandwidth", UintegerValue (25));

219

221

220

  // remove shadowing component

222

  // remove shadowing component

221

  lteHelper->SetPathlossModelAttribute ("ShadowSigmaOutdoor", DoubleValue (0.0));

223

  lteHelper->SetPathlossModelAttribute ("ShadowSigmaOutdoor", DoubleValue (0.0));

(-)a/src/lte/test/lte-test-pf-ff-mac-scheduler.cc (+8 lines)

Lines 238-243 LenaPfFfMacSchedulerTestCase1::DoRun (void)	Link Here

238

  Ptr<LteHelper> lteHelper = CreateObject<LteHelper> ();

238

  Ptr<LteHelper> lteHelper = CreateObject<LteHelper> ();

239

  lteHelper->SetAttribute ("PathlossModel", StringValue ("ns3::FriisSpectrumPropagationLossModel"));

239

  lteHelper->SetAttribute ("PathlossModel", StringValue ("ns3::FriisSpectrumPropagationLossModel"));

240

241

  // set DL and UL bandwidth

242

  lteHelper->SetEnbDeviceAttribute ("DlBandwidth", UintegerValue (25));

243

  lteHelper->SetEnbDeviceAttribute ("UlBandwidth", UintegerValue (25));

244

241

  // Create Nodes: eNodeB and UE

245

  // Create Nodes: eNodeB and UE

242

  NodeContainer enbNodes;

246

  NodeContainer enbNodes;

243

  NodeContainer ueNodes;

247

  NodeContainer ueNodes;

Lines 402-407 LenaPfFfMacSchedulerTestCase2::DoRun (void)	Link Here

402

406

403

  lteHelper->SetAttribute ("PathlossModel", StringValue ("ns3::FriisSpectrumPropagationLossModel"));

407

  lteHelper->SetAttribute ("PathlossModel", StringValue ("ns3::FriisSpectrumPropagationLossModel"));

404

408

409

  // set DL and UL bandwidth

410

  lteHelper->SetEnbDeviceAttribute ("DlBandwidth", UintegerValue (25));

411

  lteHelper->SetEnbDeviceAttribute ("UlBandwidth", UintegerValue (25));

412

405

  // Create Nodes: eNodeB and UE

413

  // Create Nodes: eNodeB and UE

406

  NodeContainer enbNodes;

414

  NodeContainer enbNodes;

407

  NodeContainer ueNodes;

415

  NodeContainer ueNodes;

(-)a/src/lte/test/lte-test-phy-error-model.cc (+8 lines)

Lines 199-204 LenaDataPhyErrorModelTestCase::DoRun (void)	Link Here

199

  lena->SetPathlossModelAttribute ("ShadowSigmaIndoor", DoubleValue (0.0));

199

  lena->SetPathlossModelAttribute ("ShadowSigmaIndoor", DoubleValue (0.0));

200

  lena->SetPathlossModelAttribute ("ShadowSigmaExtWalls", DoubleValue (0.0));

200

  lena->SetPathlossModelAttribute ("ShadowSigmaExtWalls", DoubleValue (0.0));

201

202

  // set DL and UL bandwidth

203

  lena->SetEnbDeviceAttribute ("DlBandwidth", UintegerValue (25));

204

  lena->SetEnbDeviceAttribute ("UlBandwidth", UintegerValue (25));

205

202

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

206

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

203

  NetDeviceContainer enbDevs;

207

  NetDeviceContainer enbDevs;

204

  NetDeviceContainer ueDevs;

208

  NetDeviceContainer ueDevs;

Lines 354-359 LenaDlCtrlPhyErrorModelTestCase::DoRun (void)	Link Here

354

  lena->SetPathlossModelAttribute ("ShadowSigmaOutdoor", DoubleValue (0.0));

358

  lena->SetPathlossModelAttribute ("ShadowSigmaOutdoor", DoubleValue (0.0));

355

  lena->SetPathlossModelAttribute ("ShadowSigmaIndoor", DoubleValue (0.0));

359

  lena->SetPathlossModelAttribute ("ShadowSigmaIndoor", DoubleValue (0.0));

356

  lena->SetPathlossModelAttribute ("ShadowSigmaExtWalls", DoubleValue (0.0));

360

  lena->SetPathlossModelAttribute ("ShadowSigmaExtWalls", DoubleValue (0.0));

361

362

  // set DL and UL bandwidth

363

  lena->SetEnbDeviceAttribute ("DlBandwidth", UintegerValue (25));

364

  lena->SetEnbDeviceAttribute ("UlBandwidth", UintegerValue (25));

357

365

358

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

366

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

359

  NetDeviceContainer enbDevs;

367

  NetDeviceContainer enbDevs;

(-)a/src/lte/test/lte-test-rr-ff-mac-scheduler.cc (+4 lines)

Lines 201-206 LenaRrFfMacSchedulerTestCase::DoRun (void)	Link Here

201

202

  lteHelper->SetAttribute ("PathlossModel", StringValue ("ns3::FriisSpectrumPropagationLossModel"));

202

  lteHelper->SetAttribute ("PathlossModel", StringValue ("ns3::FriisSpectrumPropagationLossModel"));

203

204

  // set DL and UL bandwidth

205

  lteHelper->SetEnbDeviceAttribute ("DlBandwidth", UintegerValue (25));

206

  lteHelper->SetEnbDeviceAttribute ("UlBandwidth", UintegerValue (25));

207

204

  // Create Nodes: eNodeB and UE

208

  // Create Nodes: eNodeB and UE

205

  NodeContainer enbNodes;

209

  NodeContainer enbNodes;

206

  NodeContainer ueNodes;

210

  NodeContainer ueNodes;

(-)a/src/lte/test/lte-test-tdbet-ff-mac-scheduler.cc (+8 lines)

Lines 222-227 LenaTdBetFfMacSchedulerTestCase1::DoRun (void)	Link Here

222

223

  lteHelper->SetAttribute ("PathlossModel", StringValue ("ns3::FriisSpectrumPropagationLossModel"));

223

  lteHelper->SetAttribute ("PathlossModel", StringValue ("ns3::FriisSpectrumPropagationLossModel"));

224

225

  // set DL and UL bandwidth

226

  lteHelper->SetEnbDeviceAttribute ("DlBandwidth", UintegerValue (25));

227

  lteHelper->SetEnbDeviceAttribute ("UlBandwidth", UintegerValue (25));

228

225

  // Create Nodes: eNodeB and UE

229

  // Create Nodes: eNodeB and UE

226

  NodeContainer enbNodes;

230

  NodeContainer enbNodes;

227

  NodeContainer ueNodes;

231

  NodeContainer ueNodes;

Lines 388-393 LenaTdBetFfMacSchedulerTestCase2::DoRun (void)	Link Here

388

392

389

  lteHelper->SetAttribute ("PathlossModel", StringValue ("ns3::FriisSpectrumPropagationLossModel"));

393

  lteHelper->SetAttribute ("PathlossModel", StringValue ("ns3::FriisSpectrumPropagationLossModel"));

390

394

395

  // set DL and UL bandwidth

396

  lteHelper->SetEnbDeviceAttribute ("DlBandwidth", UintegerValue (25));

397

  lteHelper->SetEnbDeviceAttribute ("UlBandwidth", UintegerValue (25));

398

391

  // Create Nodes: eNodeB and UE

399

  // Create Nodes: eNodeB and UE

392

  NodeContainer enbNodes;

400

  NodeContainer enbNodes;

393

  NodeContainer ueNodes;

401

  NodeContainer ueNodes;

(-)a/src/lte/test/lte-test-tdmt-ff-mac-scheduler.cc (+4 lines)

Lines 205-210 LenaTdMtFfMacSchedulerTestCase::DoRun (void)	Link Here

205

  Ptr<LteHelper> lteHelper = CreateObject<LteHelper> ();

205

  Ptr<LteHelper> lteHelper = CreateObject<LteHelper> ();

206

  lteHelper->SetAttribute ("PathlossModel", StringValue ("ns3::FriisSpectrumPropagationLossModel"));

206

  lteHelper->SetAttribute ("PathlossModel", StringValue ("ns3::FriisSpectrumPropagationLossModel"));

207

208

  // set DL and UL bandwidth

209

  lteHelper->SetEnbDeviceAttribute ("DlBandwidth", UintegerValue (25));

210

  lteHelper->SetEnbDeviceAttribute ("UlBandwidth", UintegerValue (25));

211

208

  // Create Nodes: eNodeB and UE

212

  // Create Nodes: eNodeB and UE

209

  NodeContainer enbNodes;

213

  NodeContainer enbNodes;

210

  NodeContainer ueNodes;

214

  NodeContainer ueNodes;

(-)a/src/lte/test/lte-test-tta-ff-mac-scheduler.cc (+4 lines)

Lines 208-213 LenaTtaFfMacSchedulerTestCase::DoRun (void)	Link Here

208

  Ptr<LteHelper> lteHelper = CreateObject<LteHelper> ();

208

  Ptr<LteHelper> lteHelper = CreateObject<LteHelper> ();

209

  lteHelper->SetAttribute ("PathlossModel", StringValue ("ns3::FriisSpectrumPropagationLossModel"));

209

  lteHelper->SetAttribute ("PathlossModel", StringValue ("ns3::FriisSpectrumPropagationLossModel"));

210

211

  // set DL and UL bandwidth

212

  lteHelper->SetEnbDeviceAttribute ("DlBandwidth", UintegerValue (25));

213

  lteHelper->SetEnbDeviceAttribute ("UlBandwidth", UintegerValue (25));

214

211

  // Create Nodes: eNodeB and UE

215

  // Create Nodes: eNodeB and UE

212

  NodeContainer enbNodes;

216

  NodeContainer enbNodes;

213

  NodeContainer ueNodes;

217

  NodeContainer ueNodes;

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

Lines 554-559 LteUeMeasurementsPiecewiseTestCase1::DoRun ()	Link Here

554

                           StringValue ("ns3::FriisSpectrumPropagationLossModel"));

554

                           StringValue ("ns3::FriisSpectrumPropagationLossModel"));

555

  lteHelper->SetAttribute ("UseIdealRrc", BooleanValue (true));

555

  lteHelper->SetAttribute ("UseIdealRrc", BooleanValue (true));

556

557

  // set DL and UL bandwidth.

558

  lteHelper->SetEnbDeviceAttribute ("DlBandwidth", UintegerValue (25));

559

  lteHelper->SetEnbDeviceAttribute ("UlBandwidth", UintegerValue (25));

560

557

  //Disable Uplink Power Control

561

  //Disable Uplink Power Control

558

  Config::SetDefault ("ns3::LteUePhy::EnableUplinkPowerControl", BooleanValue (false));

562

  Config::SetDefault ("ns3::LteUePhy::EnableUplinkPowerControl", BooleanValue (false));

559

563

Lines 1139-1144 LteUeMeasurementsPiecewiseTestCase2::DoRun ()	Link Here

1139

                           StringValue ("ns3::FriisSpectrumPropagationLossModel"));

1143

                           StringValue ("ns3::FriisSpectrumPropagationLossModel"));

1140

  lteHelper->SetAttribute ("UseIdealRrc", BooleanValue (true));

1144

  lteHelper->SetAttribute ("UseIdealRrc", BooleanValue (true));

1141

1145

1146

  // set DL and UL bandwidth.

1147

  lteHelper->SetEnbDeviceAttribute ("DlBandwidth", UintegerValue (25));

1148

  lteHelper->SetEnbDeviceAttribute ("UlBandwidth", UintegerValue (25));

1149

1142

  //Disable Uplink Power Control

1150

  //Disable Uplink Power Control

1143

  Config::SetDefault ("ns3::LteUePhy::EnableUplinkPowerControl", BooleanValue (false));

1151

  Config::SetDefault ("ns3::LteUePhy::EnableUplinkPowerControl", BooleanValue (false));

1144

1152

Lines 1692-1697 LteUeMeasurementsHandoverTestCase::DoRun ()	Link Here

1692

                           StringValue ("ns3::FriisSpectrumPropagationLossModel"));

1700

                           StringValue ("ns3::FriisSpectrumPropagationLossModel"));

1693

  lteHelper->SetAttribute ("UseIdealRrc", BooleanValue (true));

1701

  lteHelper->SetAttribute ("UseIdealRrc", BooleanValue (true));

1694

1702

1703

  // set DL and UL bandwidth

1704

  lteHelper->SetEnbDeviceAttribute ("DlBandwidth", UintegerValue (25));

1705

  lteHelper->SetEnbDeviceAttribute ("UlBandwidth", UintegerValue (25));

1706

1695

  //Disable Uplink Power Control

1707

  //Disable Uplink Power Control

1696

  Config::SetDefault ("ns3::LteUePhy::EnableUplinkPowerControl", BooleanValue (false));

1708

  Config::SetDefault ("ns3::LteUePhy::EnableUplinkPowerControl", BooleanValue (false));

1697

1709

(-)a/src/lte/test/test-lte-antenna.cc (+4 lines)

Lines 161-166 LteEnbAntennaTestCase::DoRun (void)	Link Here

161

  lteHelper->SetEnbAntennaModelAttribute ("Beamwidth",   DoubleValue (m_beamwidthDegrees));

161

  lteHelper->SetEnbAntennaModelAttribute ("Beamwidth",   DoubleValue (m_beamwidthDegrees));

162

  lteHelper->SetEnbAntennaModelAttribute ("MaxGain",     DoubleValue (0.0));

162

  lteHelper->SetEnbAntennaModelAttribute ("MaxGain",     DoubleValue (0.0));

163

164

  // set DL and UL bandwidth.

165

  lteHelper->SetEnbDeviceAttribute ("DlBandwidth", UintegerValue (25));

166

  lteHelper->SetEnbDeviceAttribute ("UlBandwidth", UintegerValue (25));

167

164

  enbDevs = lteHelper->InstallEnbDevice (enbNodes);

168

  enbDevs = lteHelper->InstallEnbDevice (enbNodes);

165

  ueDevs = lteHelper->InstallUeDevice (ueNodes);

169

  ueDevs = lteHelper->InstallUeDevice (ueNodes);

166

170

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

Lines 211-217 LteX2HandoverTestCase::DoRun ()	Link Here

211

  m_lteHelper->SetSchedulerType (m_schedulerType);

211

  m_lteHelper->SetSchedulerType (m_schedulerType);

212

  m_lteHelper->SetHandoverAlgorithmType ("ns3::NoOpHandoverAlgorithm"); // disable automatic handover

212

  m_lteHelper->SetHandoverAlgorithmType ("ns3::NoOpHandoverAlgorithm"); // disable automatic handover

213

  m_lteHelper->SetAttribute ("UseIdealRrc", BooleanValue (m_useIdealRrc));

213

  m_lteHelper->SetAttribute ("UseIdealRrc", BooleanValue (m_useIdealRrc));

214

215

  // set DL and UL bandwidth.

216

  m_lteHelper->SetEnbDeviceAttribute ("DlBandwidth", UintegerValue (25));

217

  m_lteHelper->SetEnbDeviceAttribute ("UlBandwidth", UintegerValue (25));

218

215

219

216

  NodeContainer enbNodes;

220

  NodeContainer enbNodes;

217

  enbNodes.Create (2);

221

  enbNodes.Create (2);

Return to bug 2798