Ready for testing

Signed-off-by: Dimitris Aragiorgis <dimara@grnet.gr>

diff --git a/conf/infra.conf b/conf/infra.conf
index 44ef04c..5ed829e 100644 (file)
--- a/conf/infra.conf
+++ b/conf/infra.conf
@@ -6,17 +6,17 @@ PUBLIC_BRIDGE=
 BRIDGE_PREFIX=prv
 # GRNET specific configuration 
 # one vlan for IP less/proxy ARP routing of public IPs 
-PUBLIC_VLAN_ID=201
+PUBLIC_VLAN_ID=700
 
 # one vlan for bridging private lans with ebtables for filtering
-PRIVATE_BRIDGE_ID=0
-PRIVATE_VLAN_ID=2990
+PRIVATE_BRIDGE_ID=
+PRIVATE_VLAN_ID=
 
 # in case of private lans mac prefix is used for isolation
 MAC_MASK=ff:ff:ff:0:0:0
 
 # one bridge per vlan for expensive private networks
 #PRIVATE_BRIDGE_ID_RANGE=`seq 2991 2999`
-PRIVATE_VLAN_ID_OFFSET=2990
+PRIVATE_VLAN_ID_OFFSET=2979
 PRIVATE_VLAN_ID_MIN=1
-PRIVATE_VLAN_ID_MAX=5
+PRIVATE_VLAN_ID_MAX=10

diff --git a/snf-network-build-node-infra b/snf-network-build-node-infra
index 8c2c2e7..e9f3933 100755 (executable)
--- a/snf-network-build-node-infra
+++ b/snf-network-build-node-infra
@@ -47,7 +47,7 @@ GRNET)
     echo PRIVATE_BRIDGE=$BRIDGE_PREFIX$PRIVATE_BRIDGE_ID
   fi
   ;;
-generic)
+GENERIC)
   echo
   echo PUBLIC_LINK=$PUBLIC_BRIDGE
   ;;