* mv the commands that fit in monitors (or operation teams) work-flow to 'commands...

* mv special purpose commands to 'tools' directory.

diff --git a/Monitor.spec b/Monitor.spec
index 9d47dec..0665e61 100644 (file)
--- a/Monitor.spec
+++ b/Monitor.spec
@@ -131,7 +131,7 @@ rm -rf $RPM_BUILD_ROOT
 #################### CLIENT 
 #install -D -m 755 monitor-client.init $RPM_BUILD_ROOT/%{_initrddir}/monitor
 #install -D -m 644 monitor.cron $RPM_BUILD_ROOT/%{_sysconfdir}/cron.d/monitor
-install -D -m 755 timeout.pl $RPM_BUILD_ROOT/usr/bin/timeout.pl
+install -D -m 755 tools/timeout.pl $RPM_BUILD_ROOT/usr/bin/timeout.pl
 
 
 #################### SERVER

diff --git a/automate-default.sh b/automate-default.sh
index c0b4b7b..3354a69 100755 (executable)
--- a/automate-default.sh
+++ b/automate-default.sh
@@ -26,7 +26,7 @@ if [ -f $MONITOR_PID ] ; then
                PID=`cat $MONITOR_PID`
                rm -f $MONITOR_PID
                if [ -z $PID ] ; then
-                       ${MONITOR_SCRIPT_ROOT}/kill.cmd.sh $PID
+                       ${MONITOR_SCRIPT_ROOT}/tools/kill.cmd.sh $PID
                        echo "done."
                else
                        echo "No PID to be killed."
@@ -62,21 +62,19 @@ fi
 #TODO: should add a call to ssh-add -l to check if the keys are loaded or not.
 source ${MONITOR_SCRIPT_ROOT}/agent.sh
 
-#${MONITOR_SCRIPT_ROOT}/checksync.py $DATE || :
-${MONITOR_SCRIPT_ROOT}/syncwithplc.py $DATE || :
+${MONITOR_SCRIPT_ROOT}/tools/syncwithplc.py $DATE || :
 service plc restart monitor
 
 echo "Performing FindAll Nodes"
 #########################
 # 1. FINDBAD NODES 
-${MONITOR_SCRIPT_ROOT}/findall.py $DATE || :
+${MONITOR_SCRIPT_ROOT}/commands/findall.py $DATE || :
 ps ax | grep BatchMode | grep -v grep | awk '{print $1}' | xargs -r kill || :
 # clean up stray 'locfg' processes that hang around inappropriately...
 ps ax | grep locfg | grep -v grep | awk '{print $1}' | xargs -r kill || :
 
 
 ${MONITOR_SCRIPT_ROOT}/policy.py $DATE || :
-${MONITOR_SCRIPT_ROOT}/statistics/add-record.py || :
 curl -s 'http://summer.cs.princeton.edu/status/tabulator.cgi?table=table_nodeview&formatcsv' > /var/lib/monitor/comon/$DATE.comon.csv || :
 
 cp ${MONITOR_SCRIPT_ROOT}/monitor.log ${MONITOR_ARCHIVE_ROOT}/`date +%F-%H:%M`.monitor.log

diff --git a/blacklist.py b/commands/blacklist.py
similarity index 100%
rename from blacklist.py
rename to commands/blacklist.py

diff --git a/bootman.py b/commands/bootman.py
similarity index 100%
rename from bootman.py
rename to commands/bootman.py

diff --git a/checksync.py b/commands/checksync.py
similarity index 100%
rename from checksync.py
rename to commands/checksync.py

diff --git a/comonquery.py b/commands/comonquery.py
similarity index 100%
rename from comonquery.py
rename to commands/comonquery.py

diff --git a/findall.py b/commands/findall.py
similarity index 100%
rename from findall.py
rename to commands/findall.py

diff --git a/findbad.py b/commands/findbad.py
similarity index 100%
rename from findbad.py
rename to commands/findbad.py

diff --git a/findbadpcu.py b/commands/findbadpcu.py
similarity index 100%
rename from findbadpcu.py
rename to commands/findbadpcu.py

diff --git a/nodebad.py b/commands/nodebad.py
similarity index 100%
rename from nodebad.py
rename to commands/nodebad.py

diff --git a/nodeconfig.py b/commands/nodeconfig.py
similarity index 100%
rename from nodeconfig.py
rename to commands/nodeconfig.py

diff --git a/nodegroups.py b/commands/nodegroups.py
similarity index 100%
rename from nodegroups.py
rename to commands/nodegroups.py

diff --git a/nodeinfo.py b/commands/nodeinfo.py
similarity index 100%
rename from nodeinfo.py
rename to commands/nodeinfo.py

diff --git a/nodequery.py b/commands/nodequery.py
similarity index 100%
rename from nodequery.py
rename to commands/nodequery.py

diff --git a/pcubad.py b/commands/pcubad.py
similarity index 100%
rename from pcubad.py
rename to commands/pcubad.py

diff --git a/pcuinfo.py b/commands/pcuinfo.py
similarity index 100%
rename from pcuinfo.py
rename to commands/pcuinfo.py

diff --git a/plcquery.py b/commands/plcquery.py
similarity index 100%
rename from plcquery.py
rename to commands/plcquery.py

diff --git a/policy.py b/commands/policy.py
similarity index 100%
rename from policy.py
rename to commands/policy.py

diff --git a/shconfig.py b/commands/shconfig.py
similarity index 100%
rename from shconfig.py
rename to commands/shconfig.py

diff --git a/sitebad.py b/commands/sitebad.py
similarity index 100%
rename from sitebad.py
rename to commands/sitebad.py

diff --git a/siteinfo.py b/commands/siteinfo.py
similarity index 100%
rename from siteinfo.py
rename to commands/siteinfo.py

diff --git a/siteleave.py b/commands/siteleave.py
similarity index 100%
rename from siteleave.py
rename to commands/siteleave.py

diff --git a/syncwithplc.py b/commands/syncwithplc.py
similarity index 100%
rename from syncwithplc.py
rename to commands/syncwithplc.py

diff --git a/model.txt b/docs/model.txt
similarity index 100%
rename from model.txt
rename to docs/model.txt

diff --git a/rt_db b/rt_db
deleted file mode 100644 (file)
index eba79ec..0000000
--- a/rt_db
+++ /dev/null
@@ -1,4 +0,0 @@
-RT_DB_HOST=rt.planet-lab.org
-RT_DB_USER=rt_ro
-RT_DB_PASSWORD=rtropassword
-RT_DB_NAME=rt3

diff --git a/automate/automate.py b/tools/automate/automate.py
similarity index 100%
rename from automate/automate.py
rename to tools/automate/automate.py

diff --git a/automate/fetch.py b/tools/automate/fetch.py
similarity index 100%
rename from automate/fetch.py
rename to tools/automate/fetch.py

diff --git a/automate/query.py b/tools/automate/query.py
similarity index 100%
rename from automate/query.py
rename to tools/automate/query.py

diff --git a/automate/vxargs.py b/tools/automate/vxargs.py
similarity index 100%
rename from automate/vxargs.py
rename to tools/automate/vxargs.py

diff --git a/extra/nodeaction.py b/tools/extra/nodeaction.py
similarity index 100%
rename from extra/nodeaction.py
rename to tools/extra/nodeaction.py

diff --git a/extra/nodediff.py b/tools/extra/nodediff.py
similarity index 100%
rename from extra/nodediff.py
rename to tools/extra/nodediff.py

diff --git a/extra/nodehistory.py b/tools/extra/nodehistory.py
similarity index 100%
rename from extra/nodehistory.py
rename to tools/extra/nodehistory.py

diff --git a/extra/nodesets.py b/tools/extra/nodesets.py
similarity index 100%
rename from extra/nodesets.py
rename to tools/extra/nodesets.py

diff --git a/extra/pcutest.py b/tools/extra/pcutest.py
similarity index 100%
rename from extra/pcutest.py
rename to tools/extra/pcutest.py

diff --git a/extra/pkl2php.py b/tools/extra/pkl2php.py
similarity index 100%
rename from extra/pkl2php.py
rename to tools/extra/pkl2php.py

diff --git a/extra/prep_power_users.py b/tools/extra/prep_power_users.py
similarity index 100%
rename from extra/prep_power_users.py
rename to tools/extra/prep_power_users.py

diff --git a/extra/printpdb.py b/tools/extra/printpdb.py
similarity index 100%
rename from extra/printpdb.py
rename to tools/extra/printpdb.py

diff --git a/extra/showlatlon.py b/tools/extra/showlatlon.py
similarity index 100%
rename from extra/showlatlon.py
rename to tools/extra/showlatlon.py

diff --git a/extra/template.py b/tools/extra/template.py
similarity index 100%
rename from extra/template.py
rename to tools/extra/template.py

diff --git a/getsshkeys.py b/tools/getsshkeys.py
similarity index 100%
rename from getsshkeys.py
rename to tools/getsshkeys.py

diff --git a/kill.cmd.sh b/tools/kill.cmd.sh
similarity index 100%
rename from kill.cmd.sh
rename to tools/kill.cmd.sh

diff --git a/nagios/plc2nagios.py b/tools/plc2nagios.py
similarity index 100%
rename from nagios/plc2nagios.py
rename to tools/plc2nagios.py

diff --git a/setup-agent.sh b/tools/setup-agent.sh
similarity index 100%
rename from setup-agent.sh
rename to tools/setup-agent.sh

diff --git a/testapi.py b/tools/testapi.py
similarity index 100%
rename from testapi.py
rename to tools/testapi.py

diff --git a/timeout.pl b/tools/timeout.pl
similarity index 100%
rename from timeout.pl
rename to tools/timeout.pl