oca 3.0.1 → 3.2.1

data/lib/OpenNebula/ImagePool.rb

@@ -1,5 +1,5 @@
 # -------------------------------------------------------------------------- #
-# Copyright 2002-2011, OpenNebula Project Leads (OpenNebula.org)             #
+# 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    #
@@ -14,6 +14,7 @@
 # limitations under the License.                                             #
 #--------------------------------------------------------------------------- #
 
+
 require 'OpenNebula/Pool'
 
 module OpenNebula
@@ -21,7 +22,8 @@ module OpenNebula
         #######################################################################
         # Constants and Class attribute accessors
         #######################################################################
-        
+
+
         IMAGE_POOL_METHODS = {
             :info => "imagepool.info"
         }
@@ -29,7 +31,7 @@ module OpenNebula
         #######################################################################
         # Class constructor & Pool Methods
         #######################################################################
-        
+
         # +client+ a Client object that represents a XML-RPC connection
         # +user_id+ is to refer to a Pool with Images from that user
         def initialize(client, user_id=-1)

data/lib/OpenNebula/Pool.rb

@@ -1,5 +1,5 @@
 # -------------------------------------------------------------------------- #
-# Copyright 2002-2011, OpenNebula Project Leads (OpenNebula.org)             #
+# 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    #
@@ -14,10 +14,11 @@
 # limitations under the License.                                             #
 #--------------------------------------------------------------------------- #
 
+
 module OpenNebula
+
     # The Pool class represents a generic OpenNebula Pool in XML format
     # and provides the basic functionality to handle the Pool elements
-    
     class Pool < XMLPool
         include Enumerable
 
@@ -32,7 +33,6 @@ module OpenNebula
             @element_name = element.upcase
 
             @client = client
-            @hash   = nil
         end
 
         # Default Factory Method for the Pools. The factory method returns an
@@ -47,7 +47,7 @@ module OpenNebula
         #######################################################################
         # Common XML-RPC Methods for all the Pool Types
         #######################################################################
-        
+
         #Gets the pool without any filter. Host, Group and User Pools
         # xml_method:: _String_ the name of the XML-RPC method
         def info(xml_method)
@@ -65,7 +65,7 @@ module OpenNebula
         def info_group(xml_method)
             return xmlrpc_info(xml_method,INFO_GROUP,-1,-1)
         end
-    
+
         def info_filter(xml_method, who, start_id, end_id)
             return xmlrpc_info(xml_method,who, start_id, end_id)
         end
@@ -119,7 +119,6 @@ module OpenNebula
         def initialize(node, client)
             @xml    = node
             @client = client
-            @hash   = nil
 
             if self['ID']
                 @pe_id = self['ID'].to_i
@@ -213,6 +212,47 @@ module OpenNebula
             return rc
         end
 
+        # Calls to the corresponding chmod method to modify
+        # the object's permission bits
+        #
+        # @param xml_method [String] the name of the XML-RPC method
+        # @param octet [String] Permissions octed , e.g. 640
+        # @return [nil, OpenNebula::Error] nil in case of success, Error
+        #   otherwise
+        def chmod_octet(xml_method, octet)
+            owner_u = octet[0..0].to_i & 4 != 0 ? 1 : 0
+            owner_m = octet[0..0].to_i & 2 != 0 ? 1 : 0
+            owner_a = octet[0..0].to_i & 1 != 0 ? 1 : 0
+            group_u = octet[1..1].to_i & 4 != 0 ? 1 : 0
+            group_m = octet[1..1].to_i & 2 != 0 ? 1 : 0
+            group_a = octet[1..1].to_i & 1 != 0 ? 1 : 0
+            other_u = octet[2..2].to_i & 4 != 0 ? 1 : 0
+            other_m = octet[2..2].to_i & 2 != 0 ? 1 : 0
+            other_a = octet[2..2].to_i & 1 != 0 ? 1 : 0
+
+            chmod(owner_u, owner_m, owner_a, group_u, group_m, group_a, other_u,
+                other_m, other_a)
+        end
+
+        # Calls to the corresponding chmod method to modify
+        # the object's permission bits
+        # Each [Integer] parameter must be 1 to allow, 0 deny, -1 do not change
+        #
+        # @param xml_method [String] the name of the XML-RPC method
+        # @return [nil, OpenNebula::Error] nil in case of success, Error
+        #   otherwise
+        def chmod(xml_method, owner_u, owner_m, owner_a, group_u, group_m, group_a, other_u,
+                other_m, other_a)
+            return Error.new('ID not defined') if !@pe_id
+
+            rc = @client.call(xml_method, @pe_id, owner_u, owner_m,
+                            owner_a, group_u, group_m, group_a, other_u,
+                            other_m, other_a)
+            rc = nil if !OpenNebula.is_error?(rc)
+
+            return rc
+        end
+
     public
 
         # Creates new element specifying its id

data/lib/OpenNebula/Template.rb

@@ -1,5 +1,5 @@
 # -------------------------------------------------------------------------- #
-# Copyright 2002-2011, OpenNebula Project Leads (OpenNebula.org)             #
+# 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    #
@@ -14,13 +14,16 @@
 # limitations under the License.                                             #
 #--------------------------------------------------------------------------- #
 
+
 require 'OpenNebula/Pool'
 
 module OpenNebula
     class Template < PoolElement
-        # ---------------------------------------------------------------------
+        #######################################################################
         # Constants and Class Methods
-        # ---------------------------------------------------------------------
+        #######################################################################
+
+
         TEMPLATE_METHODS = {
             :allocate    => "template.allocate",
             :instantiate => "template.instantiate",
@@ -28,7 +31,8 @@ module OpenNebula
             :update      => "template.update",
             :publish     => "template.publish",
             :delete      => "template.delete",
-            :chown       => "template.chown"
+            :chown       => "template.chown",
+            :chmod       => "template.chmod"
         }
 
         # Creates a Template description with just its identifier
@@ -48,18 +52,16 @@ module OpenNebula
             XMLElement.build_xml(obj_xml,'VMTEMPLATE')
         end
 
-        # ---------------------------------------------------------------------
         # Class constructor
-        # ---------------------------------------------------------------------
         def initialize(xml, client)
             super(xml,client)
 
             @client = client
         end
 
-        # ---------------------------------------------------------------------
+        #######################################################################
         # XML-RPC Methods for the Template Object
-        # ---------------------------------------------------------------------
+        #######################################################################
 
         # Retrieves the information of the given Template.
         def info()
@@ -118,9 +120,29 @@ module OpenNebula
             super(TEMPLATE_METHODS[:chown], uid, gid)
         end
 
-        # ---------------------------------------------------------------------
+        # Changes the Template permissions.
+        #
+        # @param octet [String] Permissions octed , e.g. 640
+        # @return [nil, OpenNebula::Error] nil in case of success, Error
+        #   otherwise
+        def chmod_octet(octet)
+            super(TEMPLATE_METHODS[:chmod], octet)
+        end
+
+        # Changes the Template permissions.
+        # Each [Integer] argument must be 1 to allow, 0 deny, -1 do not change
+        #
+        # @return [nil, OpenNebula::Error] nil in case of success, Error
+        #   otherwise
+        def chmod(owner_u, owner_m, owner_a, group_u, group_m, group_a, other_u,
+                other_m, other_a)
+            super(TEMPLATE_METHODS[:chmod], owner_u, owner_m, owner_a, group_u,
+                group_m, group_a, other_u, other_m, other_a)
+        end
+
+        #######################################################################
         # Helpers to get Template information
-        # ---------------------------------------------------------------------
+        #######################################################################
 
         # Returns the group identifier
         # [return] _Integer_ the element's group ID
@@ -132,15 +154,20 @@ module OpenNebula
             self['UID'].to_i
         end
 
+        def public?
+            if self['PERMISSIONS/GROUP_U'] == "1" || self['PERMISSIONS/OTHER_U'] == "1"
+                true
+            else
+                false
+            end
+        end
+
     private
 
         def set_publish(published)
-            return Error.new('ID not defined') if !@pe_id
+            group_u = published ? 1 : 0
 
-            rc = @client.call(TEMPLATE_METHODS[:publish], @pe_id, published)
-            rc = nil if !OpenNebula.is_error?(rc)
-
-            return rc
+            chmod(-1, -1, -1, group_u, -1, -1, -1, -1, -1)
         end
     end
 end

data/lib/OpenNebula/TemplatePool.rb

@@ -1,5 +1,5 @@
 # -------------------------------------------------------------------------- #
-# Copyright 2002-2011, OpenNebula Project Leads (OpenNebula.org)             #
+# 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    #
@@ -14,21 +14,23 @@
 # limitations under the License.                                             #
 #--------------------------------------------------------------------------- #
 
+
 require 'OpenNebula/Pool'
 
 module OpenNebula
     class TemplatePool < Pool
-        # ---------------------------------------------------------------------
+        #######################################################################
         # Constants and Class attribute accessors
-        # ---------------------------------------------------------------------
+        #######################################################################
+
 
         TEMPLATE_POOL_METHODS = {
             :info => "templatepool.info"
         }
 
-        # ---------------------------------------------------------------------
+        #######################################################################
         # Class constructor & Pool Methods
-        # ---------------------------------------------------------------------
+        #######################################################################
 
         # +client+ a Client object that represents an XML-RPC connection
         # +user_id+ used to refer to a Pool with Templates from that user
@@ -43,9 +45,10 @@ module OpenNebula
             OpenNebula::Template.new(element_xml,@client)
         end
 
-        # ---------------------------------------------------------------------
+        #######################################################################
         # XML-RPC Methods for the Template Object
-        # ---------------------------------------------------------------------
+        #######################################################################
+
         # Retrieves all or part of the VirtualMachines in the pool.
         def info(*args)
             case args.size

data/lib/OpenNebula/User.rb

@@ -1,5 +1,5 @@
 # -------------------------------------------------------------------------- #
-# Copyright 2002-2011, OpenNebula Project Leads (OpenNebula.org)             #
+# 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    #
@@ -14,22 +14,41 @@
 # limitations under the License.                                             #
 #--------------------------------------------------------------------------- #
 
+
 require 'OpenNebula/Pool'
 
 module OpenNebula
     class User < PoolElement
-        # ---------------------------------------------------------------------
+        #######################################################################
         # Constants and Class Methods
-        # ---------------------------------------------------------------------
+        #######################################################################
+
         USER_METHODS = {
             :info     => "user.info",
             :allocate => "user.allocate",
             :delete   => "user.delete",
             :passwd   => "user.passwd",
-            :chgrp    => "user.chgrp"
+            :chgrp    => "user.chgrp",
+            :update   => "user.update",
+            :chauth   => "user.chauth"
         }
 
-        SELF = -1
+        SELF      = -1
+
+        # Driver name for default core authentication
+        CORE_AUTH = "core"
+
+        # Driver name for default core authentication
+        CIPHER_AUTH = "server_cipher"
+
+        # Driver name for ssh authentication
+        SSH_AUTH  = "ssh"
+
+        # Driver name for x509 authentication
+        X509_AUTH = "x509"
+
+        # Driver name for x509 proxy authentication
+        X509_PROXY_AUTH = "x509_proxy"
 
         # Creates a User description with just its identifier
         # this method should be used to create plain User objects.
@@ -48,18 +67,16 @@ module OpenNebula
             XMLElement.build_xml(user_xml, 'USER')
         end
 
-        # ---------------------------------------------------------------------
         # Class constructor
-        # ---------------------------------------------------------------------
         def initialize(xml, client)
             super(xml,client)
 
             @client = client
         end
 
-        # ---------------------------------------------------------------------
+        #######################################################################
         # XML-RPC Methods for the User Object
-        # ---------------------------------------------------------------------
+        #######################################################################
 
         # Retrieves the information of the given User.
         def info()
@@ -71,8 +88,15 @@ module OpenNebula
         # +username+ Name of the new user.
         #
         # +password+ Password for the new user
-        def allocate(username, password)
-            super(USER_METHODS[:allocate], username, password)
+        def allocate(username, password, driver=CORE_AUTH)
+            super(USER_METHODS[:allocate], username, password, driver)
+        end
+
+        # Replaces the template contents
+        #
+        # +new_template+ New template contents
+        def update(new_template)
+            super(USER_METHODS[:update], new_template)
         end
 
         # Deletes the User
@@ -104,9 +128,25 @@ module OpenNebula
             return rc
         end
 
-        # ---------------------------------------------------------------------
+        # Changes the auth driver and the password of the given User
+        #
+        # @param auth [String] the new auth driver
+        # @param password [String] the new password. If it is an empty string,
+        #   the user password is not changed
+        # @return [nil, OpenNebula::Error] nil in case of success, Error
+        #   otherwise
+        def chauth(auth, password="")
+            return Error.new('ID not defined') if !@pe_id
+
+            rc = @client.call(USER_METHODS[:chauth],@pe_id, auth, password)
+            rc = nil if !OpenNebula.is_error?(rc)
+
+            return rc
+        end
+
+        #######################################################################
         # Helpers to get User information
-        # ---------------------------------------------------------------------
+        #######################################################################
 
         # Returns the group identifier
         # [return] _Integer_ the element's group ID

data/lib/OpenNebula/UserPool.rb

@@ -1,5 +1,5 @@
 # -------------------------------------------------------------------------- #
-# Copyright 2002-2011, OpenNebula Project Leads (OpenNebula.org)             #
+# 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    #
@@ -14,22 +14,23 @@
 # limitations under the License.                                             #
 #--------------------------------------------------------------------------- #
 
+
 require 'OpenNebula/Pool'
 
 module OpenNebula
     class UserPool < Pool
-        # ---------------------------------------------------------------------
+        #######################################################################
         # Constants and Class attribute accessors
-        # ---------------------------------------------------------------------
+        #######################################################################
 
         USER_POOL_METHODS = {
             :info => "userpool.info"
         }
 
-        # ---------------------------------------------------------------------
+        #######################################################################
         # Class constructor & Pool Methods
-        # ---------------------------------------------------------------------
-        
+        #######################################################################
+
         # +client+ a Client object that represents a XML-RPC connection
         def initialize(client)
             super('USER_POOL','USER',client)
@@ -40,9 +41,9 @@ module OpenNebula
             OpenNebula::User.new(element_xml,@client)
         end
 
-        # ---------------------------------------------------------------------
+        #######################################################################
         # XML-RPC Methods for the User Object
-        # ---------------------------------------------------------------------
+        #######################################################################
 
         # Retrieves all the Users in the pool.
         def info()