Changeset 307

Timestamp:

Oct 19, 2017, 8:11:44 PM (7 years ago)

Author:

g7moreau

Message:

• Better doc for exportsw option and better dynamic completion

Location:

trunk

Files:

• klask (modified) (4 diffs)
• klask.bash_completion (modified) (1 diff)

trunk/klask

@@ -1122 +1122 @@
 
  klask updatesw [--verbose|-v]
- klask exportsw [--format|-f txt|dot]
+ klask exportsw [--format|-f txt|dot] [--modulo|-m XX] [--shift|-s YY]
 
  klask searchdb [--kind|-k host|mac] computer [mac-address]
@@ -3058 +3058 @@
 
  klask updatesw [--verbose|-v]
- klask exportsw [--format|-f txt|dot]
+ klask exportsw [--format|-f txt|dot] [--modulo|-m XX] [--shift|-s YY]
 
  klask searchdb [--kind|-k host|mac] computer [mac-address]
@@ -3232 +3232 @@
 =head2 exportsw
 
- klask exportsw [--format|-f txt|dot]
+ klask exportsw [--format|-f txt|dot] [--modulo|-m XX] [--shift|-s YY]
 
 This command print the content of the switch database. There is actually two format.
@@ -3241 +3241 @@
  dot -Tpng /tmp/map.dot > /tmp/map.png
 
+In case you have too many switch connected on one switch,
+the graphviz result graph could be too much vertical.
+With C<--modulo> > 0, you can specify how many switches (connected on one switch) are on the same columns
+before shifting them to one column to the left and back again.
+The C<--shift> parameter must be 1, 2 or 3.
+With C<--shift> egual to 2, the shift will be to two column to the left.
+With 3, it will be 1 to the left and 2 to the left one time over two !
+In practise, we just add virtuals nodes in the dot file,
+that means the result graph is generated with theses virtuals but invisibles nodes...
 
 =head2 ip-free

trunk/klask.bash_completion

@@ -22 +22 @@
          return 0
          ;;
+      -s|--shift)
+         COMPREPLY=($(compgen -W "1 2 3" -- "$cur"))
+         return 0
+         ;;
    esac
 
-   if [[ "$cur" == -* ]]
+   if [[ "$cur" == '-*' || $COMP_CWORD -gt 1 ]]
    then
-      COMPREPLY=($(compgen -W '-v --verbose -k --kind -f --format -d --day -i --vlan' -- "$cur"))
+      #COMPREPLY=($(compgen -W '-v --verbose -k --kind -f --format -d --day -i --vlan -m --modulo -s --shift' -- "$cur"))
+      COMPREPLY=($(compgen -W "$(klask  help|grep "^ klask ${COMP_WORDS[1]}" | sed -e 's/[\[]/\n/g;'|grep -- '^-'|cut -f 1 -d ']'|cut -f 1 -d ' '|sed -e 's/|/ /g;'|xargs echo -n)" -- "$cur"))
    else
       COMPREPLY=($(compgen -W "$($(which klask || echo /usr/sbin/klask) help|grep '^ klask'|awk '{print $2}'|xargs echo -n)" -- "$cur"))