Changeset 695

Timestamp:

Nov 11, 2007 4:30:07 AM (6 years ago)

Author:

dkg

Message:

vblade-persist: allow destruction of persistent vblades, and make mac address filtering convenient for persistent vblades.

File:

• trunk/vblade-persist/src/vblade-persist (modified) (10 diffs)

trunk/vblade-persist/src/vblade-persist

@@ -12 +12 @@
 
 usage() {
-    echo "usage: vblade-persist setup SHELF SLOT NETIF SOURCE"
-    echo "       vblade-persist ls"
+    echo "usage: vblade-persist ls"
     echo "       vblade-persist start|stop|restart|auto|noauto SHELF SLOT"
     echo "       vblade-persist start|stop|restart|auto|noauto all"
+    echo "       vblade-persist setup SHELF SLOT NETIF SOURCE"
+    echo "       vblade-persist destroy SHELF SLOT"
+    echo "       vblade-persist mac SHELF SLOT"
+    echo "       vblade-persist mac SHELF SLOT clear"
+    echo "       vblade-persist mac SHELF SLOT add [MAC ...] "
+    echo "       vblade-persist mac SHELF SLOT del [MAC ...] "
 }
 
@@ -67 +72 @@
 
 setup() {
-    SHELF="$1"
-    SLOT="$2"
-    NETIF="$3"
-    SOURCE="$4"
+    local SHELF="$1"
+    local SLOT="$2"
+    local NETIF="$3"
+    local SOURCE="$4"
 
     verify_shelf "$SHELF" || fatal "not a valid shelf: '$SHELF'"
@@ -77 +82 @@
     verify_source "$SOURCE" || fatal "not a valid source: '$SOURCE'"
 
-    DNAME="e$SHELF.$SLOT"
+    local DNAME="e$SHELF.$SLOT"
     
     mkdir "$VDIR/$DNAME" || fatal "Could not create directory '$VDIR/$DNAME'"
@@ -100 +105 @@
 }
 
+destroy() {
+    local SHELF="$1"
+    local SLOT="$2"
+    verify_shelf "$SHELF" || fatal "Not a valid shelf: '$SHELF'"
+    verify_slot "$SLOT" || fatal "Not a valid slot: '$SLOT'"
+
+    local DNAME="e$SHELF.$SLOT"
+    local DPATH="$VDIR/$DNAME"
+    verify_vblade_persist_path "$DPATH" || fatal "'`basename $DPATH`' is not a vblade-persist-managed export."
+    
+    rm -f "/var/lib/service/vblade-$DNAME"
+    sv exit "$DPATH"
+    rm -rf "$DPATH"
+}
+
 
 list() {
@@ -111 +131 @@
 svcommand() {
     require_sv
-    CMD="$1"
-    SVDIR="$2"
-    verify_vblade_persist_path "$SVDIR" || fatal "This is not a vblade-persist path"
+    local CMD="$1"
+    local SVDIR="$2"
+    verify_vblade_persist_path "$SVDIR" || fatal "'`basename $DPATH`' is not a vblade-persist-managed export"
     sv "$CMD" "$SVDIR"
 }
@@ -119 +139 @@
 
 auto() {
-    verify_vblade_persist_path "$2" || fatal "This is not a vblade-persist path"
+    verify_vblade_persist_path "$2" || fatal "'`basename $DPATH`' is not a vblade-persist-managed export"
     if [ "$1" == "auto" ] ; then
         rm -f "$2/down"
@@ -128 +148 @@
 
 autoall() {
-    AUTO="$1"
+    local AUTO="$1"
     for dev in `ls "$VDIR"` ; do
         auto "$AUTO" "$VDIR/$dev"
@@ -136 +156 @@
 svall() {
     require_sv
-    CMD="$1"
+    local CMD="$1"
     for dev in `ls "$VDIR"` ; do
         svcommand "$CMD" "$VDIR/$dev"
@@ -142 +162 @@
 }
 
+mac() {
+    local SHELF="$1"
+    shift
+    local SLOT="$1"
+    shift
+
+    verify_shelf "$SHELF" || fatal "Not a valid shelf: '$SHELF'"
+    verify_slot "$SLOT" || fatal "Not a valid slot: '$SLOT'"
+    
+    local DPATH="$VDIR/e$SHELF.$SLOT"
+    verify_vblade_persist_path "$DPATH" || fatal "'`basename $DPATH`' is not a vblade-persist-managed export."
+
+    local CHANGES=no
+
+    local CMD="$1"
+    case "$CMD" in
+        clear)
+            if (ls "$DPATH/macs/" | grep -q ^.) ; then
+                rm -f "$DPATH"/macs/*
+                CHANGES=yes
+            fi
+            ;;
+        add)
+            shift
+            for mac in "$@"; do 
+                if [ ! -e "$DPATH/macs/$mac" ] ; then
+                    touch "$DPATH/macs/$mac"
+                    CHANGES=yes
+                fi
+            done
+            ;;
+        del)
+            shift
+            for mac in "$@"; do 
+                if [ -e "$DPATH/macs/$mac" ] ; then
+                    rm -f "$DPATH/macs/$mac"
+                    CHANGES=yes
+                fi
+            done
+            ;;
+        *)
+            ls -1 "$DPATH/macs/"
+            ;;
+    esac
+
+    # restart the vblade upon change
+    if [ "$CHANGES" == "yes" ] && [ `cat "$DPATH/supervise/stat"` == "run" ] ; then
+        sv restart "$DPATH"
+    fi
+}
+
 case "$1" in
     setup)
         setup "$2" "$3" "$4" "$5"
+        ;;
+    destroy)
+        destroy "$2" "$3"
         ;;
     l*)
@@ -167 +241 @@
         fi
         ;;
+    mac)
+        shift
+        mac "$@"
+        ;;
     *)
         usage