Refactor UDMI to external repo

.gitignore

@@ -24,6 +24,7 @@ validations/
 /inst/
 /faucet/
 /forch/
+/udmi/
 /mininet/
 /local/
 /firebase/.firebaserc

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
@@ -164,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
@@ -176,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

docker/include/bin/start_faux

@@ -213,10 +213,10 @@ fi
 if [ -n "${options[pubber]}" ]; then
     echo Running cloud pubber tool...
     (while date; do
-	 pubber/bin/run
-	 # Do https query in case pubber is not configured, for testing port 443
-	 curl -o /dev/null https://google.com
-	 sleep 30
+         pubber/bin/run local/pubber.json
+         # Do https query in case pubber is not configured, for testing port 443
+         curl -o /dev/null https://google.com
+         sleep 30
      done) &
 fi
 

docker/modules/Dockerfile.faux1

@@ -15,7 +15,7 @@ ENV BACHASH=94a794a756ee0d37c6a2e53e08747ee021415aa8
 RUN bin/retry_cmd git clone https://github.com/grafnu/bacnet4j.git --single-branch \
   && cd bacnet4j && git reset --hard $BACHASH && ../bin/retry_cmd ./gradlew shadow
 
-COPY pubber/ pubber/
+COPY udmi/pubber/ pubber/
 RUN pubber/bin/build
 
 FROM daqf/aardvark:latest
@@ -42,7 +42,7 @@ COPY --from=java_build /root/bacnet4j/*.jar bacnet4j/
 COPY docker/include/bin/bacnet_discover bin/
 
 COPY --from=java_build /root/pubber/build/libs/*.jar pubber/build/libs/
-COPY pubber/bin/run pubber/bin/
+COPY udmi/pubber/bin/run pubber/bin/
 
 COPY subset/pentests/brute_server.py pentests/
 COPY subset/security/tlsfaux tlsfaux/