opennebula 4.5.80.beta → 4.5.85.rc1

data/lib/opennebula.rb

@@ -56,5 +56,5 @@ require 'opennebula/system'
 module OpenNebula
 
     # OpenNebula version
-    VERSION = '4.5.80'
+    VERSION = '4.5.85'
 end

data/lib/opennebula/group.rb

@@ -37,7 +37,7 @@ module OpenNebula
         SELF = -1
 
         # Default resource ACL's for group users (create)
-        GROUP_DEFAULT_ACLS = "VM+IMAGE+NET+TEMPLATE+DOCUMENT"
+        GROUP_DEFAULT_ACLS = "VM+IMAGE+TEMPLATE+DOCUMENT"
         ALL_CLUSTERS_IN_ZONE = 10
 
         # The default view for group and group admins, must be defined in
@@ -79,34 +79,29 @@ module OpenNebula
         alias_method :info!, :info
 
         # Creates a group based in a group definition hash
-        #   group_hash[:name]
-        #   group_hash[:admin_group]
-        #   group_hash[:user][:name]
-        #   group_hash[:user][:password]
+        #   group_hash[:name] the group name
+        #   group_hash[:group_admin] the admin user definition hash, see def
+        #   create_admin_user function description for details.
         #   group_hash[:resource_providers]
         #   group_hash[:resource_providers][:zone_id]
         #   group_hash[:resource_providers][:cluster_id]
         #
         def create(group_hash)
             # Check arguments
-            return -1, "Group name not defined" if !group_hash[:name]
-
-            if group_hash[:user]
-                if group_hash[:user][:name] and !group_hash[:admin_group]
-                    return -1, "Admin user defined but not admin group"
-                end
+            if !group_hash[:name]
+                return OpenNebula::Error.new("Group name not defined")
+            end
 
-                if group_hash[:user][:name] and !group_hash[:user][:password]
-                    return -1, "Admin user password not defined"
+            if group_hash[:group_admin]
+                if group_hash[:group_admin][:name] && !group_hash[:group_admin][:password]
+                    error_msg = "Admin user password not defined"
+                    return OpenNebula::Error.new(error_msg)
                 end
             end
 
             # Allocate group
             rc = self.allocate(group_hash[:name])
-
-            if OpenNebula.is_error?(rc)
-                return -1, "Error allocating group: #{rc.message}"
-            end
+            return rc if OpenNebula.is_error?(rc)
 
             # Handle resource providers
             group_hash[:resource_providers].each { |rp|
@@ -123,24 +118,26 @@ module OpenNebula
             rc, msg = create_default_acls(group_hash[:resources])
 
             if OpenNebula.is_error?(rc)
-                self.delete
-                return -1, "Error creating group ACL's: #{rc.message}"
+                error_msg =  "Error creating group ACL's: #{rc.message}"
+                return OpenNebula::Error.new(error_msg)
             end
 
-            # Create associated admin group if needed
-            rc = create_group_admin(group_hash)
+            # Create associated group admin if needed
+            rc = create_admin_user(group_hash)
 
             if OpenNebula.is_error?(rc)
                 self.delete
-                return -1, "Error creating admin group: #{rc.message}"
+                error_msg =  "Error creating admin group: #{rc.message}"
+                return OpenNebula::Error.new(error_msg)
             end
 
             # Add default Sunstone views for the group
             if group_hash[:views]
-                self.update("SUNSTONE_VIEWS=\"#{group_hash[:views].join(",")}\"\n")
+                str = "SUNSTONE_VIEWS=\"#{group_hash[:views].join(",")}\"\n"
+                self.update(str, true)
             end
 
-            return 0, ""
+            return 0
         end
 
         # Allocates a new Group in OpenNebula
@@ -264,81 +261,76 @@ module OpenNebula
 
         # Creates a group admin and user based on the group definition hash
         # @param gdef [Hash] keys are ruby sumbols
-        #     gdef[:admin_group] the group name
-        #     gdef[:user][:name] of admin user for the admin group
-        #     gdef[:user][:password] of admin user
-        #     gdef[:user][:auth_driver] of the admin user
-        #     gdef[:admin_resources]
-        #     gdef[:resources]
-        #
+        #     gdef[:group_admin] the group admin hash
+        #     gdef[:group_admin][:name] username for group admin
+        #     gdef[:group_admin][:password] password for group admin
+        #     gdef[:group_admin][:auth_driver] auth driver for group admin
+        #     gdef[:group_admin][:resources] resources that group admin manage
+        #     gdef[:group_admin][:manage_resources] whether group admin manages
+        #                                           group users
+        #     gdef[:resources] resources that group users manage
         #
         # @return [nil, OpenNebula::Error] nil in case of success, Error
-        def create_group_admin(gdef)
+        def create_admin_user(gdef)
 
-            return nil if gdef[:admin_group].nil?
+            return nil if gdef[:group_admin].nil? || gdef[:group_admin][:name].nil?
 
-            # Create the admin group
-            gadmin = Group.new(Group.build_xml, @client)
-            rc     = gadmin.allocate(gdef[:admin_group])
-
-            return rc if OpenNebula.is_error?(rc)
-
-            # Create group admin user
-            uadmin  = gdef[:user][:name] if gdef[:user]
-            upasswd = gdef[:user][:password] if gdef[:user]
-            udriver = gdef[:user][:auth_driver] if gdef[:user]
+            # Create group admin
+            uadmin  = gdef[:group_admin][:name]
+            upasswd = gdef[:group_admin][:password]
+            udriver = gdef[:group_admin][:auth_driver]
 
             if !uadmin.nil? && !upasswd.nil?
 
-                user = OpenNebula::User.new(OpenNebula::User.build_xml,
-                                    @client)
+                group_admin = OpenNebula::User.new(OpenNebula::User.build_xml,
+                                                   @client)
 
                 if udriver
-                    rc = user.allocate(uadmin, upasswd, udriver)
+                    rc = group_admin.allocate(uadmin, upasswd, udriver)
                 else
-                    rc = user.allocate(uadmin, upasswd)
+                    rc = group_admin.allocate(uadmin, upasswd)
                 end
 
                 if OpenNebula.is_error?(rc)
-                    gadmin.delete
                     return rc
                 end
+            end
 
-                # Set admin user groups to admin group and self
-                rc = user.chgrp(self.id)
-                rc = user.addgroup(gadmin.id) if !OpenNebula.is_error?(rc)
+            # Set admin user groups to self
+            rc = group_admin.chgrp(self.id)
 
-                if OpenNebula.is_error?(rc)
-                    user.delete
-                    gadmin.delete
-                    return rc
-                end
+            if OpenNebula.is_error?(rc)
+                group_admin.delete
+                return rc
             end
 
             #Create admin group acls
             acls = Array.new
 
-            acls_str = gdef[:admin_resources] || gdef[:resources] || GROUP_DEFAULT_ACLS
+            acls_str = (gdef[:group_admin][:resources] || \
+                        gdef[:resources] || GROUP_DEFAULT_ACLS)
 
-            manage_users = gdef[:admin_manage_users] || "YES"
+            manage_users = gdef[:group_admin][:manage_users] || "YES"
 
             if manage_users.upcase == "YES"
-                acls << "@#{gadmin.id} USER/* CREATE"
-                acls << "@#{gadmin.id} USER/@#{self.id} USE+MANAGE+ADMIN"
+                acls << "##{group_admin.id} USER/@#{self.id} CREATE+USE+MANAGE+ADMIN"
             end
 
-            acls << "@#{gadmin.id} #{acls_str}/@#{self.id} CREATE+USE+MANAGE"
+            acls << "##{group_admin.id} #{acls_str}/@#{self.id} " +
+                    "CREATE+USE+MANAGE"
 
             rc, tmp = create_group_acls(acls)
 
             if OpenNebula.is_error?(rc)
-                user.delete
-                gadmin.delete
+                group_admin.delete
                 return rc
             end
 
             #Set Sunstone Views for the group
-            gadmin.update("SUNSTONE_VIEWS=#{GROUP_ADMIN_SUNSTONE_VIEWS}\n")
+            gtmpl =  "GROUP_ADMINS=#{gdef[:group_admin][:name]}\n"
+            gtmpl << "GROUP_ADMIN_VIEWS=#{GROUP_ADMIN_SUNSTONE_VIEWS}\n"
+
+            self.update(gtmpl, true)
 
             return nil
         end

data/lib/opennebula/virtual_machine.rb

@@ -391,10 +391,13 @@ module OpenNebula
         #   to use the default type
         # @param hot [true|false] True to save the disk immediately, false will
         #   perform the operation when the VM shuts down
+        # @param do_template [true|false] True to clone also the VM originating
+        # template and replace the disk with the saved image
         #
         # @return [Integer, OpenNebula::Error] the new Image ID in case of
         #   success, error otherwise
-        def disk_snapshot(disk_id, image_name, image_type="", hot=false)
+        def disk_snapshot(disk_id, image_name, image_type="", hot=false,
+            do_template=false)
             return Error.new('ID not defined') if !@pe_id
 
             rc = @client.call(VM_METHODS[:savedisk],
@@ -402,8 +405,8 @@ module OpenNebula
                               disk_id,
                               image_name,
                               image_type,
-                              hot)
-
+                              hot,
+                              do_template)
             return rc
         end
 

metadata

@@ -1,41 +1,46 @@
 --- !ruby/object:Gem::Specification
 name: opennebula
 version: !ruby/object:Gem::Version
-  version: 4.5.80.beta
+  version: 4.5.85.rc1
+  prerelease: 7
 platform: ruby
 authors:
 - OpenNebula
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-14 00:00:00.000000000 Z
+date: 2014-04-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: Libraries needed to talk to OpenNebula
@@ -44,72 +49,73 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- LICENSE
-- NOTICE
 - lib/opennebula.rb
-- lib/opennebula/acl.rb
-- lib/opennebula/acl_pool.rb
-- lib/opennebula/client.rb
-- lib/opennebula/cluster.rb
+- lib/opennebula/document_json.rb
+- lib/opennebula/host.rb
+- lib/opennebula/group_pool.rb
+- lib/opennebula/user_pool.rb
+- lib/opennebula/pool.rb
 - lib/opennebula/cluster_pool.rb
+- lib/opennebula/template_pool.rb
+- lib/opennebula/document_pool.rb
 - lib/opennebula/datastore.rb
 - lib/opennebula/datastore_pool.rb
-- lib/opennebula/document.rb
-- lib/opennebula/document_json.rb
-- lib/opennebula/document_pool.rb
+- lib/opennebula/xml_pool.rb
+- lib/opennebula/xml_utils.rb
 - lib/opennebula/document_pool_json.rb
+- lib/opennebula/acl_pool.rb
+- lib/opennebula/template.rb
+- lib/opennebula/zone.rb
+- lib/opennebula/client.rb
+- lib/opennebula/cluster.rb
+- lib/opennebula/pool_element.rb
+- lib/opennebula/virtual_machine.rb
+- lib/opennebula/user.rb
 - lib/opennebula/error.rb
-- lib/opennebula/group.rb
-- lib/opennebula/group_pool.rb
-- lib/opennebula/host.rb
-- lib/opennebula/host_pool.rb
 - lib/opennebula/image.rb
-- lib/opennebula/image_pool.rb
-- lib/opennebula/ldap_auth.rb
-- lib/opennebula/ldap_auth_spec.rb
+- lib/opennebula/host_pool.rb
+- lib/opennebula/document.rb
+- lib/opennebula/xml_element.rb
 - lib/opennebula/oneflow_client.rb
-- lib/opennebula/pool.rb
-- lib/opennebula/pool_element.rb
-- lib/opennebula/server_cipher_auth.rb
-- lib/opennebula/server_x509_auth.rb
-- lib/opennebula/ssh_auth.rb
-- lib/opennebula/system.rb
-- lib/opennebula/template.rb
-- lib/opennebula/template_pool.rb
-- lib/opennebula/user.rb
-- lib/opennebula/user_pool.rb
-- lib/opennebula/virtual_machine.rb
-- lib/opennebula/virtual_machine_pool.rb
 - lib/opennebula/virtual_network.rb
+- lib/opennebula/image_pool.rb
 - lib/opennebula/virtual_network_pool.rb
-- lib/opennebula/x509_auth.rb
-- lib/opennebula/xml_element.rb
-- lib/opennebula/xml_pool.rb
-- lib/opennebula/xml_utils.rb
-- lib/opennebula/zone.rb
 - lib/opennebula/zone_pool.rb
+- lib/opennebula/group.rb
+- lib/opennebula/system.rb
+- lib/opennebula/virtual_machine_pool.rb
+- lib/opennebula/acl.rb
+- lib/opennebula/ldap_auth.rb
+- lib/opennebula/ldap_auth_spec.rb
+- lib/opennebula/x509_auth.rb
+- lib/opennebula/ssh_auth.rb
+- lib/opennebula/server_x509_auth.rb
+- lib/opennebula/server_cipher_auth.rb
+- NOTICE
+- LICENSE
 homepage: http://opennebula.org
 licenses: []
-metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - ">="
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - ">"
+  - - ! '>'
     - !ruby/object:Gem::Version
       version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.0
+rubygems_version: 1.8.23
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: OpenNebula Client API
 test_files: []
 has_rdoc: 

checksums.yaml

@@ -1,7 +0,0 @@
----
-SHA1:
-  metadata.gz: 5feec17aea93ff26ef9c4ca5d190709ba5b12c3b
-  data.tar.gz: 218fa42198d3b3165ec54bd43fa20028402c8b7f
-SHA512:
-  metadata.gz: 4ed7c74a0a4e33a5f23075db69be3d5d8c947f24b1257389ffd8f388fd4463c78f80bdb9dd9d921668a3b02a3647ae8074103b74a6f35553617dbfeffdc3f05a
-  data.tar.gz: 11736f325b3b49d35916d0a000a2519de8ea1b925720897914890bd0d9b8d35812bf7634d35b1e6333017106585e00f5ad59526fbb48fafeb4b7ee0e101c03f8