Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add Fabian Eckermann ns-3 c-v2x model into cdasim ns3_installer #155

Merged
merged 17 commits into from
Sep 1, 2023

Conversation

chengyuan0124
Copy link
Contributor

@chengyuan0124 chengyuan0124 commented Aug 10, 2023

PR Details

Description

Related Issue

Motivation and Context

How Has This Been Tested?

Types of changes

  • Defect fix (non-breaking change that fixes an issue)
  • New feature (non-breaking change that adds functionality)
  • Breaking change (fix or feature that cause existing functionality to change)

Checklist:

  • I have added any new packages to the sonar-scanner.properties file
  • My change requires a change to the documentation.
  • I have updated the documentation accordingly.
  • I have read the CONTRIBUTING document.
    CARMA Contributing Guide
  • I have added tests to cover my changes.
  • All new and existing tests passed.

@@ -45,8 +45,8 @@ arg_federate_file=""
arg_integration_testing=false
arg_make_parallel=""

required_programs=( python3.6 gcc unzip tar )
required_libraries=( "libprotobuf-dev (or equal) 3.3.0" "libxml2-dev (or equal)" "libsqlite3-dev (or equal)" )
required_programs=(python3.6 gcc unzip tar)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Did you run this file through an auto-formatter or something? Some of these changes are slightly odd, like deleting single spaces, removing semicolons where there were previously used but not strictly necessary. It's not a bad thing, just makes the file a bit harder to review since it's more difficult to identify the meaningful changes when they're mixed in with a bunch of formatting updates.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Apologies for the confusion; it appears my VSCode automatically ran a formatting program. The modifications to the ns3_installer.sh file primarily concern the functions clone_ns3_federate, clone_ns3_cv2x, and build_ns3. If you think that is still hard to review, I can revert it and push the change again.

ns3_url="http://www.nsnam.org/release/$ns3_version_affix.tar.bz2"
ns3_cv2x="https://github.com/usdot-fhwa-stol/ns-3_c-v2x"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I take it you resolved whatever issue there was with pulling this repo into the build?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, the issue has been addressed. The problem with ns3_cv2x I referenced earlier because I modified this line in the waf file of ns-3_c-v2x from #!/usr/bin/env python to #!/usr/bin/python3.6. However, making this change and then pushing it to GitHub disrupted other parts of the waf file. As a result, I've opted to update the build command here to include python version rather than altering the waf file directly.


mkdir "${ns3_installation_path}/ns-allinone-${ns3_version}"

clone_ns3_cv2x
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Have you confirmed that the folders these are getting cloned into is picked up in the build? Like seeing the fabian-eckermann build output?

Copy link
Contributor Author

@chengyuan0124 chengyuan0124 Aug 31, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, the cloned folders are picked up in the build. the build output can be seen during the docker image build process and Fabian Eckermann LTE lib can be found in lib folder after the build

@@ -74,7 +74,7 @@
<default name="ns3::ConstantRateWifiManager::DataMode" value="OfdmRate6Mbps"/>
<default name="ns3::ConstantRateWifiManager::ControlMode" value="OfdmRate6Mbps"/>

<default name="ns3::QueueBase::MaxPackets" value="400"/>
<!-- <default name="ns3::QueueBase::MaxPackets" value="400"/> -->
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'd recommend adding a comment above that describes why we've removed this parameter for now.

@@ -113,6 +113,8 @@ cd "/opt/carma-simulation/bin/fed/ns3/"
chmod +x ns3_installer.sh
set -x
./ns3_installer.sh -q

#
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is there a reason for this blank comment?

@sonarcloud
Copy link

sonarcloud bot commented Sep 1, 2023

Kudos, SonarCloud Quality Gate passed!    Quality Gate passed

Bug A 0 Bugs
Vulnerability A 0 Vulnerabilities
Security Hotspot A 0 Security Hotspots
Code Smell A 0 Code Smells

No Coverage information No Coverage information
No Duplication information No Duplication information

warning The version of Java (11.0.20) you have used to run this analysis is deprecated and we will stop accepting it soon. Please update to at least Java 17.
Read more here

@kjrush kjrush merged commit 6cba85a into develop Sep 1, 2023
6 checks passed
@kjrush kjrush deleted the feature/cdasim-fabianEckermann-ns3-cv2x-coupling branch September 1, 2023 16:24
MishkaMN added a commit that referenced this pull request Mar 19, 2024
…er (#155)"

This reverts commit 6cba85a, reversing
changes made to be4391d.
@MishkaMN MishkaMN mentioned this pull request Mar 19, 2024
9 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants