Add mode_transitions table, and add data that gets filled into...

Add mode_transitions table, and add data that gets filled into state_transitions and mode_transitions.

sql/database-create.sql

@@ -383,6 +383,20 @@ CREATE TABLE loginmessage (
   PRIMARY KEY  (valid)
 ) TYPE=MyISAM;
 
+#
+# Table structure for table 'mode_transitions'
+#
+
+CREATE TABLE mode_transitions (
+  op_mode1 varchar(20) NOT NULL default '',
+  state1 varchar(20) NOT NULL default '',
+  op_mode2 varchar(20) NOT NULL default '',
+  state2 varchar(20) NOT NULL default '',
+  PRIMARY KEY  (op_mode1,state1,op_mode2,state2),
+  KEY op_mode1 (op_mode1,state1),
+  KEY op_mode2 (op_mode2,state2)
+) TYPE=MyISAM;
+
 #
 # Table structure for table 'newdelays'
 #

sql/database-fill.sql

@@ -169,10 +169,55 @@ REPLACE INTO state_timeouts VALUES ('NORMAL','ISUP',0,NULL);
 # Dumping data for table 'state_transitions'
 #
 
+REPLACE INTO state_transitions VALUES ('EXPTSTATUS','ACTIVATING','ACTIVE');
+REPLACE INTO state_transitions VALUES ('EXPTSTATUS','ACTIVATING','SWAPPED');
+REPLACE INTO state_transitions VALUES ('EXPTSTATUS','ACTIVATING','TESTING');
+REPLACE INTO state_transitions VALUES ('EXPTSTATUS','ACTIVE','SWAPPING');
+REPLACE INTO state_transitions VALUES ('EXPTSTATUS','NEW','PRERUN');
+REPLACE INTO state_transitions VALUES ('EXPTSTATUS','PRERUN','SWAPPED');
+REPLACE INTO state_transitions VALUES ('EXPTSTATUS','SWAPPED','ACTIVATING');
+REPLACE INTO state_transitions VALUES ('EXPTSTATUS','SWAPPED','TERMINATING');
+REPLACE INTO state_transitions VALUES ('EXPTSTATUS','SWAPPING','SWAPPED');
+REPLACE INTO state_transitions VALUES ('EXPTSTATUS','TERMINATING','TERMINATED');
+REPLACE INTO state_transitions VALUES ('EXPTSTATUS','TESTING','SWAPPING');
+REPLACE INTO state_transitions VALUES ('MINIMAL','BOOTING','ISUP');
+REPLACE INTO state_transitions VALUES ('MINIMAL','BOOTING','SHUTDOWN');
+REPLACE INTO state_transitions VALUES ('MINIMAL','ISUP','SHUTDOWN');
+REPLACE INTO state_transitions VALUES ('MINIMAL','SHUTDOWN','BOOTING');
+REPLACE INTO state_transitions VALUES ('MINIMAL','SHUTDOWN','SHUTDOWN');
+REPLACE INTO state_transitions VALUES ('NODEALLOC','FREE_CLEAN','RESERVED');
+REPLACE INTO state_transitions VALUES ('NODEALLOC','FREE_DIRTY','RELOAD');
+REPLACE INTO state_transitions VALUES ('NODEALLOC','FREE_DIRTY','RESERVED');
+REPLACE INTO state_transitions VALUES ('NODEALLOC','REBOOT','FREE_DIRTY');
+REPLACE INTO state_transitions VALUES ('NODEALLOC','RELOAD','FREE_CLEAN');
+REPLACE INTO state_transitions VALUES ('NODEALLOC','RESERVED','REBOOT');
+REPLACE INTO state_transitions VALUES ('NODEALLOC','RESERVED','RELOAD');
 REPLACE INTO state_transitions VALUES ('NORMAL','ISUP','REBOOTING');
-REPLACE INTO state_transitions VALUES ('NORMAL','REBBOTING','REBOOTING');
 REPLACE INTO state_transitions VALUES ('NORMAL','REBOOTED','ISUP');
 REPLACE INTO state_transitions VALUES ('NORMAL','REBOOTING','REBOOTED');
+REPLACE INTO state_transitions VALUES ('NORMAL','REBOOTING','REBOOTING');
+REPLACE INTO state_transitions VALUES ('NORMALv1','BOOTING','TBSETUP');
+REPLACE INTO state_transitions VALUES ('NORMALv1','ISUP','SHUTDOWN');
+REPLACE INTO state_transitions VALUES ('NORMALv1','SHUTDOWN','BOOTING');
+REPLACE INTO state_transitions VALUES ('NORMALv1','SHUTDOWN','SHUTDOWN');
+REPLACE INTO state_transitions VALUES ('NORMALv1','TBSETUP','ISUP');
+REPLACE INTO state_transitions VALUES ('RELOAD','BOOTING','RELOADSETUP');
+REPLACE INTO state_transitions VALUES ('RELOAD','RELOADING','RELOADDONE');
+REPLACE INTO state_transitions VALUES ('RELOAD','RELOADSETUP','RELOADING');
+REPLACE INTO state_transitions VALUES ('RELOAD','SHUTDOWN','BOOTING');
+REPLACE INTO state_transitions VALUES ('USERSTATUS','ACTIVE','FROZEN');
+REPLACE INTO state_transitions VALUES ('USERSTATUS','FROZEN','ACTIVE');
+REPLACE INTO state_transitions VALUES ('USERSTATUS','NEWUSER','UNAPPROVED');
+REPLACE INTO state_transitions VALUES ('USERSTATUS','UNAPPROVED','ACTIVE');
+
+#
+# Dumping data for table 'mode_transitions'
+#
+
+REPLACE INTO mode_transitions VALUES ('MINIMAL','SHUTDOWN','NORMALv1','SHUTDOWN');
+REPLACE INTO mode_transitions VALUES ('NORMALv1','SHUTDOWN','MINIMAL','SHUTDOWN');
+REPLACE INTO mode_transitions VALUES ('NORMALv1','SHUTDOWN','RELOAD','SHUTDOWN');
+REPLACE INTO mode_transitions VALUES ('RELOAD','RELOADDONE','NORMALv1','SHUTDOWN');
 
 #
 # Dumping data for table 'testsuite_preentables'
@@ -211,3 +256,4 @@ REPLACE INTO webdb_table_permissions VALUES ('node_types',1,1,0);
 REPLACE INTO webdb_table_permissions VALUES ('tiplines',1,1,1);
 REPLACE INTO webdb_table_permissions VALUES ('projects',1,1,0);
 
+