Merge branch 'master' of github.com:open-cloud/xos
diff --git a/xos/configurations/cord/make-vtn-networkconfig-json.sh b/xos/configurations/cord/make-vtn-networkconfig-json.sh
index 5256292..aa66ee7 100755
--- a/xos/configurations/cord/make-vtn-networkconfig-json.sh
+++ b/xos/configurations/cord/make-vtn-networkconfig-json.sh
@@ -9,6 +9,7 @@
"apps" : {
"org.onosproject.cordvtn" : {
"cordvtn" : {
+ "gatewayMac" : "00:00:00:00:00:01",
"nodes" : [
EOF
@@ -28,13 +29,21 @@
echo $NODE
NODEIP=`getent hosts $NODE | awk '{ print $1 }'`
+ # This part is cloudlab-specific. It examines the flat-net-1 network and extracts
+ # the eth device and ip address that was assigned to flat-net-1.
+ sudo scp root@$NODE:/root/setup/info.flat-lan-1 $SETUPDIR/flat-lan-$NODE
+ PHYPORT=`bash -c "source $SETUPDIR/flat-lan-$NODE; echo \\\$DATADEV"`
+ LOCALIP=`bash -c "source $SETUPDIR/flat-lan-$NODE; echo \\\$DATAIP"`
+
((I++))
cat >> $FN <<EOF
{
"hostname": "$NODE",
"ovsdbIp": "$NODEIP",
"ovsdbPort": "6641",
- "bridgeId": "of:000000000000000$I"
+ "bridgeId": "of:000000000000000$I",
+ "phyPortName": "$PHYPORT",
+ "localIp": "$LOCALIP"
EOF
if [[ "$I" -lt "$NODECOUNT" ]]; then
echo " }," >> $FN