isolate migration scripts in migrations/v4-to-v5

diff --git a/migrations/v4-to-v5.sed b/migrations/v4-to-v5/migrate.sed
similarity index 100%
rename from migrations/v4-to-v5.sed
rename to migrations/v4-to-v5/migrate.sed

diff --git a/migrations/v4-to-v5.sh b/migrations/v4-to-v5/migrate.sh
similarity index 94%
rename from migrations/v4-to-v5.sh
rename to migrations/v4-to-v5/migrate.sh
index 4258f1b..7f0ebcc 100755 (executable)
--- a/migrations/v4-to-v5.sh
+++ b/migrations/v4-to-v5/migrate.sh
@@ -9,7 +9,9 @@ DIRNAME=$(cd ${DIRNAME}; /bin/pwd)
 MIGRATION_SED=$DIRNAME/${BASENAME}.sed
 MIGRATION_SQL=$DIRNAME/${BASENAME}.sql
 # look in ..
-SCHEMA_SQL=$(dirname $DIRNAME)/planetlab5.sql
+UP=$(dirname $DIRNAME)
+UPUP=$(dirname $UP)
+SCHEMA_SQL=$UPUP/planetlab5.sql
 
 DATE=$(date +%Y-%m-%d-%H-%M)
 DATE_=$(date +%Y_%m_%d_%H_%M)
@@ -21,6 +23,9 @@ VIEWS_SQL=$DIRNAME/${DATE}-views5.sql
 NODEGROUPS_DEF=$DIRNAME/site-nodegroups.def
 NODEGROUPS_SQL=$DIRNAME/${DATE}-nodegroups.sql
 
+PGM_VIEWS=$UP/extract-views.py
+PGM_NODEGROUPS=$DIRNAME/parse-site-nodegroups.py
+
 # load config
 . /etc/planetlab/plc_config
 
@@ -138,10 +143,10 @@ function migrate () {
     run "Creating    planetlab5 database" createdb --user=postgres --encoding=UNICODE --owner=$PLC_DB_USER planetlab5
     run "Loading     language plpgsql" createlang -U postgres plpgsql planetlab5 || true
     run "Populating  planetlab5 from $RESTORE" psql --user=postgres -f $RESTORE planetlab5 
-    run "Parsing     $NODEGROUPS_DEF" $DIRNAME/v4-to-v5-nodegroups.py $NODEGROUPS_DEF $NODEGROUPS_SQL
+    run "Parsing     $NODEGROUPS_DEF" $PGM_NODEGROUPS $NODEGROUPS_DEF $NODEGROUPS_SQL
     run "Loading     $NODEGROUPS_SQL" psql --user=$PLC_DB_USER -f $NODEGROUPS_SQL planetlab5
     run "Fine-tuning it with $MIGRATION_SQL" psql --user=$PLC_DB_USER -f $MIGRATION_SQL planetlab5
-    run "Extracting  views definitions from $SCHEMA_SQL" ./extract-views.py $SCHEMA_SQL $VIEWS_SQL
+    run "Extracting  views definitions from $SCHEMA_SQL" $PGM_VIEWS $SCHEMA_SQL $VIEWS_SQL
     run "Inserting   views definitions in planetlab5" \
        psql --user=$PLC_DB_USER -f $VIEWS_SQL planetlab5
 }

diff --git a/migrations/v4-to-v5.sql b/migrations/v4-to-v5/migrate.sql
similarity index 100%
rename from migrations/v4-to-v5.sql
rename to migrations/v4-to-v5/migrate.sql

diff --git a/migrations/v4-to-v5-nodegroups.py b/migrations/v4-to-v5/parse-site-nodegroups.py
similarity index 100%
rename from migrations/v4-to-v5-nodegroups.py
rename to migrations/v4-to-v5/parse-site-nodegroups.py

diff --git a/migrations/site-nodegroups.def b/migrations/v4-to-v5/site-nodegroups.def
similarity index 100%
rename from migrations/site-nodegroups.def
rename to migrations/v4-to-v5/site-nodegroups.def