opennebula 3.9.80.beta → 3.9.90.rc

data/lib/opennebula.rb

@@ -54,5 +54,5 @@ require 'opennebula/system'
 module OpenNebula
 
     # OpenNebula version
-    VERSION = '3.9.80'
+    VERSION = '3.9.90'
 end

data/lib/opennebula/ldap_auth.rb

@@ -28,7 +28,8 @@ class OpenNebula::LdapAuth
             :password => nil,
             :base => nil,
             :auth_method => :simple,
-            :user_field => 'cn'
+            :user_field => 'cn',
+            :group_field => 'member'
         }.merge(options)
 
         ops={}
@@ -71,7 +72,8 @@ class OpenNebula::LdapAuth
     end
 
     def is_in_group?(user, group)
-        result=@ldap.search(:base => group, :filter => "(member=#{user})")
+        result=@ldap.search(:base => group,
+                            :filter => "(#{@options[:group_field]}=#{user})")
 
         if result && result.first
             true

data/lib/opennebula/pool_element.rb

@@ -266,4 +266,29 @@ module OpenNebula
 
         return hash
     end
+
+
+    # Alternative method with better performance for huge number of timestamps.
+    # For reasonable amounts of data, the current method is quicker
+=begin
+    def self.process_monitoring(xmldoc, root_elem, timestamp_elem, oid, xpath_expressions)
+        hash = {}
+
+        xpath_expressions.each { |xpath|
+            hash[xpath] = []
+        }
+
+        xmldoc.each("#{root_elem}[ID=#{oid}]") do |elem|
+            timestamp = elem[timestamp_elem]
+
+            xpath_expressions.each { |xpath|
+                xpath_value = elem[xpath]
+
+                hash[xpath] << [timestamp, xpath_value] if !xpath_value.nil?
+            }
+        end
+
+        return hash
+    end
+=end
 end

data/lib/opennebula/virtual_machine.rb

@@ -47,14 +47,15 @@ module OpenNebula
         }
 
         VM_STATE=%w{INIT PENDING HOLD ACTIVE STOPPED SUSPENDED DONE FAILED
-            POWEROFF}
+            POWEROFF UNDEPLOYED}
 
         LCM_STATE=%w{LCM_INIT PROLOG BOOT RUNNING MIGRATE SAVE_STOP SAVE_SUSPEND
             SAVE_MIGRATE PROLOG_MIGRATE PROLOG_RESUME EPILOG_STOP EPILOG
             SHUTDOWN CANCEL FAILURE CLEANUP_RESUBMIT UNKNOWN HOTPLUG SHUTDOWN_POWEROFF
             BOOT_UNKNOWN BOOT_POWEROFF BOOT_SUSPENDED BOOT_STOPPED CLEANUP_DELETE
             HOTPLUG_SNAPSHOT HOTPLUG_NIC HOTPLUG_SAVEAS HOTPLUG_SAVEAS_POWEROFF
-            HOTPLUG_SAVEAS_SUSPENDED}
+            HOTPLUG_SAVEAS_SUSPENDED SHUTDOWN_UNDEPLOY EPILOG_UNDEPLOY
+            PROLOG_UNDEPLOY BOOT_UNDEPLOY}
 
         SHORT_VM_STATES={
             "INIT"      => "init",
@@ -65,7 +66,8 @@ module OpenNebula
             "SUSPENDED" => "susp",
             "DONE"      => "done",
             "FAILED"    => "fail",
-            "POWEROFF"  => "poff"
+            "POWEROFF"  => "poff",
+            "UNDEPLOYED"=> "unde"
         }
 
         SHORT_LCM_STATES={
@@ -96,19 +98,26 @@ module OpenNebula
             "HOTPLUG_NIC"       => "hotp",
             "HOTPLUG_SAVEAS"           => "hotp",
             "HOTPLUG_SAVEAS_POWEROFF"  => "hotp",
-            "HOTPLUG_SAVEAS_SUSPENDED" => "hotp"
+            "HOTPLUG_SAVEAS_SUSPENDED" => "hotp",
+            "SHUTDOWN_UNDEPLOY" => "shut",
+            "EPILOG_UNDEPLOY"   => "epil",
+            "PROLOG_UNDEPLOY"   => "prol",
+            "BOOT_UNDEPLOY"     => "boot"
         }
 
-        MIGRATE_REASON=%w{NONE ERROR STOP_RESUME USER CANCEL}
+        MIGRATE_REASON=%w{NONE ERROR USER}
 
         SHORT_MIGRATE_REASON={
             "NONE"          => "none",
             "ERROR"         => "erro",
-            "STOP_RESUME"   => "stop",
-            "USER"          => "user",
-            "CANCEL"        => "canc"
+            "USER"          => "user"
         }
 
+        HISTORY_ACTION=%w{none migrate live-migrate shutdown shutdown-hard
+            undeploy undeploy-hard hold release stop suspend resume boot delete
+            delete-recreate reboot reboot-hard resched unresched poweroff
+            poweroff-hard}
+
         # Creates a VirtualMachine description with just its identifier
         # this method should be used to create plain VirtualMachine objects.
         # +id+ the id of the vm
@@ -133,6 +142,10 @@ module OpenNebula
             reason_str
         end
 
+        def VirtualMachine.get_history_action(action)
+            return HISTORY_ACTION[action.to_i]
+        end
+
         # Class constructor
         def initialize(xml, client)
             super(xml,client)
@@ -210,9 +223,14 @@ module OpenNebula
             action(hard ? 'shutdown-hard' : 'shutdown')
         end
 
+        # Shuts down an already deployed VM, saving its state in the system DS
+        def undeploy(hard=false)
+            action(hard ? 'undeploy-hard' : 'undeploy')
+        end
+
         # Powers off a running VM
-        def poweroff
-            action('poweroff')
+        def poweroff(hard=false)
+            action(hard ? 'poweroff-hard' : 'poweroff')
         end
 
         # Reboots an already deployed VM
@@ -296,17 +314,17 @@ module OpenNebula
         end
 
         # Deletes a VM from the pool
-        def destroy(recreate=false)
+        def delete(recreate=false)
             if recreate
-                action('destroy-recreate')
+                action('delete-recreate')
             else
-                action('destroy')
+                action('delete')
             end
         end
 
-        # @deprecated use {#destroy} instead
+        # @deprecated use {#delete} instead
         def finalize(recreate=false)
-            destroy(recreate)
+            delete(recreate)
         end
 
         # Forces a re-deployment of a VM in UNKNOWN or BOOT state
@@ -316,9 +334,9 @@ module OpenNebula
 
         alias_method :restart, :boot
 
-        # @deprecated use {#destroy} instead
+        # @deprecated use {#delete} instead
         def resubmit
-            action('destroy-recreate')
+            action('delete-recreate')
         end
 
         # Sets the re-scheduling flag for the VM

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: opennebula
 version: !ruby/object:Gem::Version
-  version: 3.9.80.beta
+  version: 3.9.90.rc
   prerelease: 7
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-26 00:00:00.000000000 Z
+date: 2013-04-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri