Skip to content

Commit

Permalink
Update Mininet version to 2.3.1b1
Browse files Browse the repository at this point in the history
  • Loading branch information
stevelorenz committed Apr 5, 2022
1 parent 46fe361 commit 900cb1c
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 3 deletions.
4 changes: 4 additions & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,10 @@ on:
- master
- dev

schedule:
# Run CI at 00:00 on every Monday
- cron: '0 0 * * MON'

jobs:
test:
runs-on: ubuntu-20.04
Expand Down
2 changes: 1 addition & 1 deletion comnetsemu/net.py
Original file line number Diff line number Diff line change
Expand Up @@ -429,7 +429,7 @@ def monResourceStats(
while n < sample_num:
stats = container.getCurrentStats()
mem_stats = stats["memory_stats"]
mem_usg = mem_stats["usage"] / (1024 ** 2)
mem_usg = mem_stats["usage"] / (1024**2)
cpu_usg = self._calculate_cpu_percent(stats)
usages.append((cpu_usg, mem_usg))
sleep(sample_period)
Expand Down
8 changes: 6 additions & 2 deletions util/install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@
# It ONLY supports the latest Ubuntu LTS version (20.04).
# Supporting multiple GNU/Linux distributions and versions is OUT OF SCOPE.
#
# TODO: Replace this imperative shell script to a declarative approach, e.g. Ansible
#

# Fail on error
set -e
Expand Down Expand Up @@ -86,7 +88,7 @@ UBUNTU_RELEASE="20.04"
# Truly non-interactive apt-get installation
INSTALL="sudo DEBIAN_FRONTEND=noninteractive apt-get -y -q install"
# REMOVE="sudo DEBIAN_FRONTEND=noninteractive apt-get -y -q remove"
UPDATE="sudo apt-get update"
UPDATE="sudo apt-get update --fix-missing"

DIST=Unknown
grep Ubuntu /etc/lsb-release &>/dev/null && DIST="Ubuntu"
Expand Down Expand Up @@ -150,7 +152,9 @@ DEPS_INSTALLED_FROM_SRC=(mininet)
# - Installed from source, versions are tags or branch names of dependencies
# For potential fast fixes, patches and extensions, a mirrrored/synced repo of Mininet is used.
MININET_GIT_URL="https://github.com/mininet/mininet.git"
MININET_VER="2.3.0"
# Note: The git URL issues are fixed with this commit (2.3.1b1 (#1124)), but it is not official released.
# So use this commit now can fix the install the issue, should use a release later.
MININET_VER="aa0176f"
DEPS_VERSIONS=("$MININET_VER")
DEP_INSTALL_FUNCS=(install_mininet_with_deps)

Expand Down

0 comments on commit 900cb1c

Please sign in to comment.