stickler Issue516 network test

.checkstyle.xml

@@ -42,7 +42,7 @@
 
     <module name="LineLength">
         <property name="fileExtensions" value="java"/>
-        <property name="max" value="100"/>
+        <property name="max" value="120"/>
         <property name="ignorePattern" value="^package.*|^import.*|a href|href|http://|https://|ftp://"/>
     </module>
 

.gitignore

@@ -21,16 +21,15 @@ validations/
 *.save
 
 # Runtime or sub-module files
-inst/
-faucet/
-forch/
-mininet/
-local/
-local_xxx
-local.old
-firebase/.firebaserc
-firebase/.firebase
-firebase/functions/package-lock.json
+/inst/
+/faucet/
+/forch/
+/udmi/
+/mininet/
+/local/
+/firebase/.firebaserc
+/firebase/.firebase
+/firebase/functions/package-lock.json
 nohup.out
 **/node_modules/
 .vscode/

bin/alt_faucet

@@ -0,0 +1,24 @@
+#!/bin/bash -e
+
+ROOT=$(realpath $(dirname $0)/..)
+cd $ROOT
+source etc/config_base.sh
+
+if [ -z "$switch_setup_ext_br" ]; then
+   echo switch_setup.ext_br not defined for alternate faucet setup.
+   false
+fi
+
+if [ -z "$switch_setup_alt_port" ]; then
+   echo switch_setup.alt_port not defined for alternate faucet setup.
+   false
+fi
+
+inst_name=$switch_setup_ext_br
+
+inst_dir=inst/faucet/daq-faucet-$inst_name
+mkdir -p $inst_dir
+cp config/faucet/faucet_$inst_name.yaml $inst_dir/faucet.yaml
+echo Launching alternate faucet install $inst_name on $switch_setup_alt_port
+echo DAQ autoclean docker kill daq-faucet-$inst_name
+cmd/faucet $inst_name $switch_setup_alt_port

bin/build_proto

@@ -32,6 +32,11 @@ sha1sum $proto_files > $WEB_ROOT/protos.hash
 
 gen_path=$ROOT/protoc-gen-doc/bin/protoc-gen-doc
 
+if [ -d venv ]; then
+    echo Entering virtual python environment...
+    source venv/bin/activate
+fi
+
 mkdir -p build/daq/proto build/proto
 cp $proto_files build/daq/proto/
 proto_files2=
@@ -56,3 +61,5 @@ mkdir -p libs/proto/
 touch libs/proto/__init__.py
 cp build/daq/proto/*.py libs/proto/
 cp build/protos.html $WEB_ROOT/
+
+python3 -m grpc_tools.protoc -I usi/src/main/proto/ --python_out=libs/proto/ --grpc_python_out=libs/proto/ usi/src/main/proto/usi.proto

bin/build_release

@@ -0,0 +1,82 @@
+#!/bin/bash -e
+
+if [ $# != 1 ]; then
+    echo $0 RELEASE_VERSION
+    false
+fi
+
+VERSION=$1
+shift
+
+ROOT=$(realpath $(dirname $0)/..)
+cd $ROOT
+
+changes=`git status --porcelain`
+if [ -n "$changes" ]; then
+    echo Working tree not clean.
+    false
+fi
+
+git checkout master
+
+changed=`git diff --name-only release_stable docs/changelog.md`
+if [ -z "$changed" ]; then
+    git log release_stable..HEAD --pretty=oneline | sed -e 's/[a-z0-9]+/\*/g'
+    echo docs/changelog.md has not been updated since last release_stable
+    echo Use the log lines above for inspiration.
+    false
+fi
+
+tagged=`git rev-list -n 1 $VERSION 2>/dev/null` || true
+if [ -n "$tagged" ]; then
+    echo Tag $VERSION already exists. Try the next version.
+    false
+fi
+
+source etc/config_base.sh
+
+if [ "$host_tests" != config/modules/all.conf ]; then
+    echo Configure your system with host_tests=config/modules/all.conf
+    false
+fi
+
+cmd/build force $VERSION
+
+cmd/build push
+
+cat > /tmp/git_expected.expected <<EOF
+ M etc/docker_images.txt
+ M etc/docker_images.ver
+EOF
+
+git status --porcelain > /tmp/git_status.found
+
+if ! diff /tmp/git_status.expected /tmp/git_status.found; then
+    echo Expected build images not found. Something went wrong.
+    false
+fi
+rm -f /tmp/git_status.*
+
+git commit -a -m "$VERSION release"
+git tag -a $VERSION -m "$VERSION release"
+git push
+git push --tags
+
+# Check to see if a remote 'faucet' is defined, and if so, also update that.
+faucetgit=`git config remote.faucet.url`
+if [ -n "$faucetgit" ]; then
+    git push faucet
+    git push faucet --tags
+fi
+
+firebase/deploy.sh bos-daq-testing
+git checkout release_testing && git reset --hard $VERSION
+
+if [ -n "$faucetgit" ]; then
+    git push faucet
+fi
+
+# QA pass to make sure everything is ok.
+# `firebase/deploy.sh daq-qualification-labs`
+# `git checkout release_stable && git reset --hard $VERSION`
+# `git push`

bin/external_ovs

@@ -6,14 +6,19 @@ source etc/config_base.sh
 
 ext_intf=$switch_setup_data_intf
 ext_dpid=$switch_setup_of_dpid
-ext_ofpt=$switch_setup_lo_port
 ext_brid=$switch_setup_ext_br
 ext_brpt=$switch_setup_uplink_port
 
 ext_pri=${ext_intf}
 ext_sec=${ext_intf%-pri}-sec
 
-echo ext_dpid is $ext_dpid
+if [ -z "$switch_setup_alt_port" ]; then
+    ext_ofpt=$switch_setup_lo_port
+else
+    ext_ofpt=$switch_setup_alt_port
+fi
+
+echo ext_dpid is $ext_dpid on port $ext_ofpt
 echo network_config is $network_config
 
 dpid=$(printf %016x $ext_dpid)

bin/physical_sec

@@ -119,6 +119,9 @@ else
     sudo ip addr flush dev $ext_ctrl
 fi
 
+echo Warmup ping for $ext_addr
+ping -n -c 2 $ext_addr || true
+
 echo Checking external connection to $ext_addr
 if ! ping -n -c 2 $ext_addr; then
     echo

bin/python/combine_reports_from_date_range.py

@@ -61,7 +61,7 @@ def _get_local_reports(device, reports_dir, start, end, count):
     LOGGER.info('Looking for reports locally')
     report_re = re.compile(r'^report_%s_(\d{4}-\d{2}-\d{2}T\d{6})\.json$' % device)
     json_files = [f for f in os.listdir(reports_dir) if report_re.match(f)]
-    json_files.sort()
+    json_files.sort(reverse=True)  # Match gcp behavior
     if count and len(json_files) > count:
         json_files = json_files[len(json_files) - count:]
     for json_file in json_files:

bin/setup_dev

@@ -20,8 +20,13 @@ FORCHB=${DAQ_FORCH_BRANCH}
 FORCHX=$(cat etc/FORCH_VERSION)
 FORCHV=${DAQ_FORCH_VER:-$FORCHX}
 
+UDMIR=${DAQ_UDMI_REPO:-https://github.com/faucetsdn/udmi}
+UDMIB=${DAQ_UDMI_BRANCH}
+UDMIX=$(cat etc/UDMI_VERSION)
+UDMIV=${DAQ_UDMI_VER:-$UDMIX}
+
 MININET=https://github.com/mininet/mininet
-MININETV=2.3.0d6
+MININETV=$(cat etc/MININET_VERSION)
 
 if [ -f .daq.local ]; then
     echo Loading config from .daq.local
@@ -36,6 +41,10 @@ if [ "$FORCHX" != "$FORCHV" ]; then
     echo $FORCHV > etc/FORCH_VERSION
 fi
 
+if [ "$UDMIX" != "$UDMIV" ]; then
+    echo $UDMIV > etc/UDMI_VERSION
+fi
+
 if [ -z "$AG" ]; then
     AG="sudo apt-get -qqy --no-install-recommends"
 fi
@@ -75,10 +84,6 @@ $AG install \
     python$PVERSION python3-pkg-resources python3-setuptools \
     python$PVERSION-dev python3-pip python emacs-nox python$PVERSION-venv
 
-# Jump through some hoops for mininet, which still has some python2 deps.
-$AG install python-pip
-python2 -m pip install setuptools
-
 if [ -d mininet ]; then
     echo Checking mininet version matches $MININETV...
     targetrev=$(cd mininet; git rev-parse $MININETV)
@@ -137,8 +142,9 @@ $PIP install --upgrade --index-url=https://pypi.python.org/simple Jinja2 \
     google-api-core==1.16.0 \
     google-cloud-storage==1.16.1 \
     google-cloud-firestore==1.6.0 \
-    google-cloud-logging==1.14.0
-
+    google-cloud-logging==1.14.0 \
+    grpcio-tools==1.30.0
+
 $PIP freeze
 echo Resetting .cache directory permissions...
 test -n "$USER" && sudo chown $USER -R $HOME/.cache
@@ -167,6 +173,18 @@ else
     (cd forch; git fetch; git checkout $FORCHV)
 fi
 
+if [ -z "$UDMIV" ]; then
+    echo No udmi version found, skipping.
+else
+    if [ ! -d udmi ]; then
+	echo Cloning $UDMIR...
+	git clone $UDMIR udmi
+    fi
+
+    echo Setting udmi version $UDMIV
+    (cd udmi; git fetch; git checkout $UDMIV)
+fi
+
 echo -n "DAQ commit "
 git log -n 1 --pretty=format:"%h - %an, %ar : %s" || true
 echo
@@ -179,6 +197,10 @@ echo -n "Last FORCH commit "
 (cd forch; git log -n 1 --pretty=format:"%h - %an, %ar : %s" || true)
 echo
 
+echo -n "Last UDMI commit "
+(cd udmi; git log -n 1 --pretty=format:"%h - %an, %ar : %s" || true)
+echo
+
 docker --version
 
 if ! docker images > /dev/null; then