Revision 002ec7e9

View differences:

include/History.h
37 37

  
38 38
    enum VMAction
39 39
    {
40
        NONE_ACTION,
40 41
        MIGRATE_ACTION,
41 42
        LIVE_MIGRATE_ACTION,
42 43
        SHUTDOWN_ACTION,
......
56 57
        RESCHED_ACTION,
57 58
        UNRESCHED_ACTION,
58 59
        POWEROFF_ACTION,
59
        POWEROFF_HARD_ACTION,
60
        NONE_ACTION
60
        POWEROFF_HARD_ACTION
61 61
    };
62 62

  
63 63
    static string action_to_str(VMAction action)
include/Nebula.h
345 345

  
346 346
    static string db_version()
347 347
    {
348
        return "3.9.80";
348
        return "4.0.0";
349 349
    }
350 350

  
351 351
    /**
share/doc/xsd/acct.xsd
38 38
        <xs:element name="REASON" type="xs:integer"/>
39 39

  
40 40
        <!-- ACTION values:
41
          MIGRATE_ACTION          = 0
42
          LIVE_MIGRATE_ACTION     = 1
43
          SHUTDOWN_ACTION         = 2
44
          SHUTDOWN_HARD_ACTION    = 3
45
          UNDEPLOY_ACTION         = 4
46
          UNDEPLOY_HARD_ACTION    = 5
47
          HOLD_ACTION             = 6
48
          RELEASE_ACTION          = 7
49
          STOP_ACTION             = 8
50
          SUSPEND_ACTION          = 9
51
          RESUME_ACTION           = 10
52
          BOOT_ACTION             = 11
53
          DESTROY_ACTION          = 12
54
          DESTROY_RECREATE_ACTION = 13
55
          REBOOT_ACTION           = 14
56
          REBOOT_HARD_ACTION      = 15
57
          RESCHED_ACTION          = 16
58
          UNRESCHED_ACTION        = 17
59
          POWEROFF_ACTION         = 18
60
          POWEROFF_HARD_ACTION    = 19
61
          NONE_ACTION             = 20
41
          NONE_ACTION             = 0
42
          MIGRATE_ACTION          = 1
43
          LIVE_MIGRATE_ACTION     = 2
44
          SHUTDOWN_ACTION         = 3
45
          SHUTDOWN_HARD_ACTION    = 4
46
          UNDEPLOY_ACTION         = 5
47
          UNDEPLOY_HARD_ACTION    = 6
48
          HOLD_ACTION             = 7
49
          RELEASE_ACTION          = 8
50
          STOP_ACTION             = 9
51
          SUSPEND_ACTION          = 10
52
          RESUME_ACTION           = 11
53
          BOOT_ACTION             = 12
54
          DESTROY_ACTION          = 13
55
          DESTROY_RECREATE_ACTION = 14
56
          REBOOT_ACTION           = 15
57
          REBOOT_HARD_ACTION      = 16
58
          RESCHED_ACTION          = 17
59
          UNRESCHED_ACTION        = 18
60
          POWEROFF_ACTION         = 19
61
          POWEROFF_HARD_ACTION    = 20
62 62
        -->
63 63
        <xs:element name="ACTION" type="xs:integer"/>
64 64

  
share/doc/xsd/vm.xsd
125 125
                    <xs:element name="REASON" type="xs:integer"/>
126 126

  
127 127
                    <!-- ACTION values:
128
                      MIGRATE_ACTION          = 0
129
                      LIVE_MIGRATE_ACTION     = 1
130
                      SHUTDOWN_ACTION         = 2
131
                      SHUTDOWN_HARD_ACTION    = 3
132
                      UNDEPLOY_ACTION         = 4
133
                      UNDEPLOY_HARD_ACTION    = 5
134
                      HOLD_ACTION             = 6
135
                      RELEASE_ACTION          = 7
136
                      STOP_ACTION             = 8
137
                      SUSPEND_ACTION          = 9
138
                      RESUME_ACTION           = 10
139
                      BOOT_ACTION             = 11
140
                      DESTROY_ACTION          = 12
141
                      DESTROY_RECREATE_ACTION = 13
142
                      REBOOT_ACTION           = 14
143
                      REBOOT_HARD_ACTION      = 15
144
                      RESCHED_ACTION          = 16
145
                      UNRESCHED_ACTION        = 17
146
                      POWEROFF_ACTION         = 18
147
                      POWEROFF_HARD_ACTION    = 19
148
                      NONE_ACTION             = 20
128
                      NONE_ACTION             = 0
129
                      MIGRATE_ACTION          = 1
130
                      LIVE_MIGRATE_ACTION     = 2
131
                      SHUTDOWN_ACTION         = 3
132
                      SHUTDOWN_HARD_ACTION    = 4
133
                      UNDEPLOY_ACTION         = 5
134
                      UNDEPLOY_HARD_ACTION    = 6
135
                      HOLD_ACTION             = 7
136
                      RELEASE_ACTION          = 8
137
                      STOP_ACTION             = 9
138
                      SUSPEND_ACTION          = 10
139
                      RESUME_ACTION           = 11
140
                      BOOT_ACTION             = 12
141
                      DESTROY_ACTION          = 13
142
                      DESTROY_RECREATE_ACTION = 14
143
                      REBOOT_ACTION           = 15
144
                      REBOOT_HARD_ACTION      = 16
145
                      RESCHED_ACTION          = 17
146
                      UNRESCHED_ACTION        = 18
147
                      POWEROFF_ACTION         = 19
148
                      POWEROFF_HARD_ACTION    = 20
149 149
                    -->
150 150
                    <xs:element name="ACTION" type="xs:integer"/>
151 151
                  </xs:sequence>
src/oca/ruby/opennebula/virtual_machine.rb
111 111
            "USER"          => "user"
112 112
        }
113 113

  
114
        HISTORY_ACTION=%w{migrate migrate-live shutdown shutdown-hard undeploy
115
            undeploy-hard hold release stop suspend resume boot destroy
114
        HISTORY_ACTION=%w{none migrate migrate-live shutdown shutdown-hard
115
            undeploy undeploy-hard hold release stop suspend resume boot destroy
116 116
            destroy-recreate reboot reboot-hard resched unresched poweroff
117
            poweroff-hard none}
117
            poweroff-hard}
118 118

  
119 119
        # Creates a VirtualMachine description with just its identifier
120 120
        # this method should be used to create plain VirtualMachine objects.
src/onedb/3.9.80_to_4.0.0.rb
83 83
    end
84 84

  
85 85
    def update_history(history_elem)
86
        history_elem.add_element("ACTION").text = "20" # NONE_ACTION
86
        history_elem.add_element("ACTION").text = "0" # NONE_ACTION
87 87

  
88 88
        # History reason enum has changed from
89 89
        # NONE, ERROR, STOP_RESUME, USER, CANCEL   to

Also available in: Unified diff