opennebula-oca 3.8.0 → 3.9.0.beta

data/lib/{OpenNebula/AclPool.rb → opennebula/acl_pool.rb}

@@ -15,7 +15,7 @@
 #--------------------------------------------------------------------------- #
 
 
-require 'OpenNebula/Pool'
+require 'opennebula/pool'
 
 module OpenNebula
     class AclPool < Pool

data/lib/{OpenNebula.rb → opennebula/client.rb}

@@ -14,81 +14,9 @@
 # limitations under the License.                                             #
 #--------------------------------------------------------------------------- #
 
-
-begin # require 'rubygems'
-    require 'rubygems'
-rescue Exception
-end
-
 require 'xmlrpc/client'
-require 'digest/sha1'
-require 'rexml/document'
-require 'pp'
-
-require 'OpenNebula/XMLUtils'
-require 'OpenNebula/VirtualMachine'
-require 'OpenNebula/VirtualMachinePool'
-require 'OpenNebula/VirtualNetwork'
-require 'OpenNebula/VirtualNetworkPool'
-require 'OpenNebula/Image'
-require 'OpenNebula/ImagePool'
-require 'OpenNebula/User'
-require 'OpenNebula/UserPool'
-require 'OpenNebula/Host'
-require 'OpenNebula/HostPool'
-require 'OpenNebula/Template'
-require 'OpenNebula/TemplatePool'
-require 'OpenNebula/Group'
-require 'OpenNebula/GroupPool'
-require 'OpenNebula/Acl'
-require 'OpenNebula/AclPool'
-require 'OpenNebula/Datastore'
-require 'OpenNebula/DatastorePool'
-require 'OpenNebula/Cluster'
-require 'OpenNebula/ClusterPool'
-require 'OpenNebula/Document'
-require 'OpenNebula/DocumentPool'
 
 module OpenNebula
-
-    # OpenNebula version
-    VERSION = '3.8.0'
-
-    # The Error Class represents a generic error in the OpenNebula
-    # library. It contains a readable representation of the error.
-    # Any function in the OpenNebula module will return an Error
-    # object in case of error.
-    class Error
-        ESUCCESS        = 0x0000
-        EAUTHENTICATION = 0x0100
-        EAUTHORIZATION  = 0x0200
-        ENO_EXISTS      = 0x0400
-        EACTION         = 0x0800
-        EXML_RPC_API    = 0x1000
-        EINTERNAL       = 0x2000
-        ENOTDEFINED     = 0x1111
-
-        attr_reader :message, :errno
-
-        # +message+ Description of the error
-        # +errno+   OpenNebula code error
-        def initialize(message=nil, errno=0x1111)
-            @message = message
-            @errno   = errno
-        end
-
-        def to_str()
-            @message
-        end
-    end
-
-    # Returns true if the object returned by a method of the OpenNebula
-    # library is an Error
-    def self.is_error?(value)
-        value.class==OpenNebula::Error
-    end
-
-
     if OpenNebula::NOKOGIRI
         class NokogiriStreamParser < XMLRPC::XMLParser::AbstractStreamParser
             def initialize
@@ -111,7 +39,6 @@ module OpenNebula
         end
     end
 
-
     # The client class, represents the connection with the core and handles the
     # xml-rpc calls.
     class Client

data/lib/{OpenNebula/Cluster.rb → opennebula/cluster.rb}

@@ -15,7 +15,7 @@
 #--------------------------------------------------------------------------- #
 
 
-require 'OpenNebula/Pool'
+require 'opennebula/pool_element'
 
 module OpenNebula
     class Cluster < PoolElement

data/lib/{OpenNebula/ClusterPool.rb → opennebula/cluster_pool.rb}

@@ -15,7 +15,7 @@
 #--------------------------------------------------------------------------- #
 
 
-require 'OpenNebula/Pool'
+require 'opennebula/pool'
 
 module OpenNebula
     class ClusterPool < Pool

data/lib/{OpenNebula/Datastore.rb → opennebula/datastore.rb}

@@ -15,7 +15,7 @@
 #--------------------------------------------------------------------------- #
 
 
-require 'OpenNebula/Pool'
+require 'opennebula/pool_element'
 
 module OpenNebula
     class Datastore < PoolElement
@@ -32,6 +32,14 @@ module OpenNebula
             :chmod      => "datastore.chmod"
         }
 
+        DATASTORE_TYPES=%w{IMAGE SYSTEM FILE}
+
+        SHORT_DATASTORE_TYPES = {
+            "IMAGE" => "img",
+            "SYSTEM"=> "sys",
+            "FILE"  => "fil"
+        }
+
         # Creates a Datastore description with just its identifier
         # this method should be used to create plain Datastore objects.
         # +id+ the id of the user
@@ -57,6 +65,20 @@ module OpenNebula
         #######################################################################
         # XML-RPC Methods for the Datastore Object
         #######################################################################
+        # Returns the datastore type
+        def type
+            self['TYPE'].to_i
+        end
+
+        # Returns the datastore type (string value)
+        def type_str
+            DATASTORE_TYPES[type]
+        end
+
+        # Returns the datastore type (string value)
+        def short_type_str
+            SHORT_DATASTORE_TYPES[type_str]
+        end
 
         # Retrieves the information of the given Datastore.
         def info()

data/lib/{OpenNebula/DatastorePool.rb → opennebula/datastore_pool.rb}

@@ -15,7 +15,7 @@
 #--------------------------------------------------------------------------- #
 
 
-require 'OpenNebula/Pool'
+require 'opennebula/pool'
 
 module OpenNebula
     class DatastorePool < Pool

data/lib/{OpenNebula/Document.rb → opennebula/document.rb}

@@ -14,14 +14,14 @@
 # limitations under the License.                                             #
 #--------------------------------------------------------------------------- #
 
-require 'OpenNebula/Pool'
+require 'opennebula/pool_element'
 
 module OpenNebula
 
     # All subclasses must define the DOCUMENT_TYPE constant.
     #
     # @example
-    #   require 'OpenNebula/Document'
+    #   require 'opennebula/document'
     #
     #   module OpenNebula
     #       class CustomObject < Document
@@ -44,6 +44,7 @@ module OpenNebula
             :chown      => "document.chown",
             :chmod      => "document.chmod",
             :clone      => "document.clone",
+            :rename     => "document.rename"
         }
 
         # Creates a Document Object description with just its identifier
@@ -185,6 +186,16 @@ module OpenNebula
             return rc
         end
 
+        # Renames this Document
+        #
+        # @param name [String] New name for the Document.
+        #
+        # @return [nil, OpenNebula::Error] nil in case of success, Error
+        #   otherwise
+        def rename(name)
+            return call(DOCUMENT_METHODS[:rename], @pe_id, name)
+        end
+
         #######################################################################
         # Helpers to get Document information
         #######################################################################

data/lib/{OpenNebula/DocumentPool.rb → opennebula/document_pool.rb}

@@ -14,7 +14,7 @@
 # limitations under the License.                                             #
 #--------------------------------------------------------------------------- #
 
-require 'OpenNebula/Pool'
+require 'opennebula/pool'
 
 module OpenNebula
 
@@ -22,7 +22,7 @@ module OpenNebula
     # and the factory method.
     #
     # @example
-    #   require 'OpenNebula/DocumentPool'
+    #   require 'opennebuña/document_pool'
     #
     #   module OpenNebula
     #       class CustomObjectPool < DocumentPool

data/lib/opennebula/error.rb

@@ -0,0 +1,52 @@
+# -------------------------------------------------------------------------- #
+# Copyright 2002-2012, OpenNebula Project Leads (OpenNebula.org)             #
+#                                                                            #
+# Licensed under the Apache License, Version 2.0 (the "License"); you may    #
+# not use this file except in compliance with the License. You may obtain    #
+# a copy of the License at                                                   #
+#                                                                            #
+# http://www.apache.org/licenses/LICENSE-2.0                                 #
+#                                                                            #
+# Unless required by applicable law or agreed to in writing, software        #
+# distributed under the License is distributed on an "AS IS" BASIS,          #
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.   #
+# See the License for the specific language governing permissions and        #
+# limitations under the License.                                             #
+#--------------------------------------------------------------------------- #
+
+
+module OpenNebula
+    # The Error Class represents a generic error in the OpenNebula
+    # library. It contains a readable representation of the error.
+    # Any function in the OpenNebula module will return an Error
+    # object in case of error.
+    class Error
+        ESUCCESS        = 0x0000
+        EAUTHENTICATION = 0x0100
+        EAUTHORIZATION  = 0x0200
+        ENO_EXISTS      = 0x0400
+        EACTION         = 0x0800
+        EXML_RPC_API    = 0x1000
+        EINTERNAL       = 0x2000
+        ENOTDEFINED     = 0x1111
+
+        attr_reader :message, :errno
+
+        # +message+ Description of the error
+        # +errno+   OpenNebula code error
+        def initialize(message=nil, errno=0x1111)
+            @message = message
+            @errno   = errno
+        end
+
+        def to_str()
+            @message
+        end
+    end
+
+    # Returns true if the object returned by a method of the OpenNebula
+    # library is an Error
+    def self.is_error?(value)
+        value.class==OpenNebula::Error
+    end
+end

data/lib/{OpenNebula/Group.rb → opennebula/group.rb}

@@ -15,7 +15,7 @@
 #--------------------------------------------------------------------------- #
 
 
-require 'OpenNebula/Pool'
+require 'opennebula/pool_element'
 
 module OpenNebula
     class Group < PoolElement

data/lib/{OpenNebula/GroupPool.rb → opennebula/group_pool.rb}

@@ -15,7 +15,7 @@
 #--------------------------------------------------------------------------- #
 
 
-require 'OpenNebula/Pool'
+require 'opennebula/pool'
 
 module OpenNebula
     class GroupPool < Pool

data/lib/{OpenNebula/Host.rb → opennebula/host.rb}

@@ -15,7 +15,7 @@
 #--------------------------------------------------------------------------- #
 
 
-require 'OpenNebula/Pool'
+require 'opennebula/pool_element'
 
 module OpenNebula
     class Host < PoolElement

data/lib/{OpenNebula/HostPool.rb → opennebula/host_pool.rb}

@@ -15,7 +15,7 @@
 #--------------------------------------------------------------------------- #
 
 
-require 'OpenNebula/Pool'
+require 'opennebula/pool'
 
 module OpenNebula
     class HostPool < Pool

data/lib/{OpenNebula/Image.rb → opennebula/image.rb}

@@ -15,7 +15,7 @@
 #--------------------------------------------------------------------------- #
 
 
-require 'OpenNebula/Pool'
+require 'opennebula/pool_element'
 require 'fileutils'
 
 module OpenNebula
@@ -35,7 +35,8 @@ module OpenNebula
             :chown       => "image.chown",
             :chmod       => "image.chmod",
             :chtype      => "image.chtype",
-            :clone       => "image.clone"
+            :clone       => "image.clone",
+            :rename      => "image.rename"
         }
 
         IMAGE_STATES=%w{INIT READY USED DISABLED LOCKED ERROR CLONE DELETE USED_PERS}
@@ -52,12 +53,15 @@ module OpenNebula
             "USED_PERS" => "used"
         }
 
-        IMAGE_TYPES=%w{OS CDROM DATABLOCK}
+        IMAGE_TYPES=%w{OS CDROM DATABLOCK KERNEL RAMDISK CONTEXT}
 
         SHORT_IMAGE_TYPES={
-            "OS"         => "OS",
-            "CDROM"      => "CD",
-            "DATABLOCK"  => "DB"
+            "OS"        => "OS",
+            "CDROM"     => "CD",
+            "DATABLOCK" => "DB",
+            "KERNEL"    => "KL",
+            "RAMDISK"   => "RD",
+            "CONTEXT"   => "CX"
         }
 
         # Creates an Image description with just its identifier
@@ -202,6 +206,16 @@ module OpenNebula
             return rc
         end
 
+        # Renames this Image
+        #
+        # @param name [String] New name for the Image.
+        #
+        # @return [nil, OpenNebula::Error] nil in case of success, Error
+        #   otherwise
+        def rename(name)
+            return call(IMAGE_METHODS[:rename], @pe_id, name)
+        end
+
         #######################################################################
         # Helpers to get Image information
         #######################################################################

data/lib/{OpenNebula/ImagePool.rb → opennebula/image_pool.rb}

@@ -15,7 +15,7 @@
 #--------------------------------------------------------------------------- #
 
 
-require 'OpenNebula/Pool'
+require 'opennebula/pool'
 
 module OpenNebula
     class ImagePool < Pool

data/lib/opennebula/ldap_auth.rb

@@ -0,0 +1,99 @@
+# ---------------------------------------------------------------------------- #
+# Copyright 2010-2012, C12G Labs S.L                                           #
+#                                                                              #
+# Licensed under the Apache License, Version 2.0 (the "License"); you may      #
+# not use this file except in compliance with the License. You may obtain      #
+# a copy of the License at                                                     #
+#                                                                              #
+# http://www.apache.org/licenses/LICENSE-2.0                                   #
+#                                                                              #
+# Unless required by applicable law or agreed to in writing, software          #
+# distributed under the License is distributed on an "AS IS" BASIS,            #
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.     #
+# See the License for the specific language governing permissions and          #
+# limitations under the License.                                               #
+# ---------------------------------------------------------------------------- #
+
+require 'rubygems'
+require 'net/ldap'
+
+module OpenNebula; end
+
+class OpenNebula::LdapAuth
+    def initialize(options)
+        @options={
+            :host => 'localhost',
+            :port => 389,
+            :user => nil,
+            :password => nil,
+            :base => nil,
+            :auth_method => :simple,
+            :user_field => 'cn'
+        }.merge(options)
+
+        ops={}
+
+        if @options[:user]
+            ops[:auth] = {
+                :method => @options[:auth_method],
+                :username => @options[:user],
+                :password => @options[:password]
+            }
+        end
+
+        ops[:host]=@options[:host] if @options[:host]
+        ops[:port]=@options[:port].to_i if @options[:port]
+        ops[:encryption]=@options[:encryption] if @options[:encryption]
+
+        @ldap=Net::LDAP.new(ops)
+    end
+
+    def find_user(name)
+        begin
+            result=@ldap.search(
+                :base => @options[:base],
+                :filter => "#{@options[:user_field]}=#{name}")
+
+            if result && result.first
+                result.first.dn
+            else
+                result=@ldap.search(:base => name)
+
+                if result && result.first
+                    name
+                else
+                    nil
+                end
+            end
+        rescue
+            nil
+        end
+    end
+
+    def is_in_group?(user, group)
+        result=@ldap.search(:base => group, :filter => "(member=#{user})")
+
+        if result && result.first
+            true
+        else
+            false
+        end
+    end
+
+    def authenticate(user, password)
+        ldap=@ldap.clone
+
+        auth={
+            :method => @options[:auth_method],
+            :username => user,
+            :password => password
+        }
+
+        if ldap.bind(auth)
+            true
+        else
+            false
+        end
+    end
+end
+

data/lib/opennebula/ldap_auth_spec.rb

@@ -0,0 +1,70 @@
+# ---------------------------------------------------------------------------- #
+# Copyright 2010-2012, C12G Labs S.L                                           #
+#                                                                              #
+# Licensed under the Apache License, Version 2.0 (the "License"); you may      #
+# not use this file except in compliance with the License. You may obtain      #
+# a copy of the License at                                                     #
+#                                                                              #
+# http://www.apache.org/licenses/LICENSE-2.0                                   #
+#                                                                              #
+# Unless required by applicable law or agreed to in writing, software          #
+# distributed under the License is distributed on an "AS IS" BASIS,            #
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.     #
+# See the License for the specific language governing permissions and          #
+# limitations under the License.                                               #
+# ---------------------------------------------------------------------------- #
+
+$: << ".."
+
+require 'ldap_auth'
+
+options={
+    :host => 'ubuntu-test',
+    :base => 'dc=localdomain'
+}
+
+describe LdapAuth do
+    before(:all) do
+        @ldap=LdapAuth.new(options)
+    end
+
+    it 'should find user dn' do
+        name=@ldap.find_user('user01')
+        name.should=='cn=user01,dc=localdomain'
+
+        name=@ldap.find_user('user02')
+        name.should=='cn=user02,dc=localdomain'
+
+        name=@ldap.find_user('user03')
+        name.should==nil
+
+        name=@ldap.find_user('cn=user01,dc=localdomain')
+        name.should=='cn=user01,dc=localdomain'
+    end
+
+    it 'should tell if a user is in a group' do
+        group='cn=cloud,ou=groups,dc=localdomain'
+
+        result=@ldap.is_in_group?('cn=user01,dc=localdomain', group)
+        result.should==true
+
+        result=@ldap.is_in_group?('cn=user02,dc=localdomain', group)
+        result.should==false
+    end
+
+    it 'should authenticate user' do
+        result=@ldap.authenticate('cn=user01,dc=localdomain', 'password01')
+        result.should==true
+
+        result=@ldap.authenticate('cn=user02,dc=localdomain', 'password02')
+        result.should==true
+
+        result=@ldap.authenticate('cn=user01,dc=localdomain', 'password02')
+        result.should==false
+
+        result=@ldap.authenticate('user01,dc=localdomain', 'password01')
+        result.should==false
+    end
+
+end
+