opennebula 4.14.2 → 4.90.0.beta1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 372e1bd2c013e6a41256485e418b1a8607154f70
-  data.tar.gz: bbd11156ee05c99ad8707fab2a4e65b7675485f8
+  metadata.gz: e860fb8028ca5276c55c13bb41ce2661310ecc33
+  data.tar.gz: 1fbbe122e328a30e83a6fa7cd3408efea2710610
 SHA512:
-  metadata.gz: 4d96afc12bec6bb369dc1d677e547c63e117181e51a64d2134cbfd648de07a8177f5eed36ad1f5c3e2fa1783df4c2fe8d25a5971c1c79eb673a2014d902d5179
-  data.tar.gz: ba4735722fdc2b3e2d0930f4779a8c4ad49348934f3a0268c15b1b1a3edac8a61461649adf4b22921a59805bbbf71458f11214e6b80ebd6fd06a2ea8e470babe
+  metadata.gz: 9d6281be6b49fb27cb38cfa03d79c9d6c5addb7615b164202c07150e60b4e5a1429afd07d587dc9200f15d0b0639b5c3abbff6307238232b680f965e063c98d3
+  data.tar.gz: 0bcb4214d63d82cf507d8c952126b510f6257b38a4e5b5b95bfa2731480141888a6f7d060573d00be1f8fb392eecaf5aeddc512c67caa29faec680ca1d1221c3

data/NOTICE

@@ -1,6 +1,6 @@
 OpenNebula Open Source Project
 --------------------------------------------------------------------------------
-Copyright 2002-2015, OpenNebula Project, OpenNebula Systems (formerly C12G Labs)
+Copyright 2002-2016, OpenNebula Project, OpenNebula Systems (formerly C12G Labs)
 --------------------------------------------------------------------------------
 
 You can find  more information about the project, release notes and

data/lib/cloud/CloudClient.rb

@@ -1,5 +1,5 @@
 # -------------------------------------------------------------------------- #
-# Copyright 2002-2015, OpenNebula Project, OpenNebula Systems                #
+# Copyright 2002-2016, OpenNebula Project, OpenNebula Systems                #
 #                                                                            #
 # 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    #
@@ -50,7 +50,7 @@ end
 module CloudClient
 
     # OpenNebula version
-    VERSION = '4.14.2'
+    VERSION = '4.90.0'
 
     # #########################################################################
     # Default location for the authentication file
@@ -201,7 +201,7 @@ module CloudCLI
     def version_text
         version=<<EOT
 OpenNebula #{CloudClient::VERSION}
-Copyright 2002-2015, OpenNebula Project, OpenNebula Systems
+Copyright 2002-2016, OpenNebula Project, OpenNebula Systems
 
 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

data/lib/opennebula.rb

@@ -1,5 +1,5 @@
 # -------------------------------------------------------------------------- #
-# Copyright 2002-2015, OpenNebula Project, OpenNebula Systems                #
+# Copyright 2002-2016, OpenNebula Project, OpenNebula Systems                #
 #                                                                            #
 # 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    #
@@ -56,9 +56,15 @@ require 'opennebula/security_group_pool'
 require 'opennebula/vdc'
 require 'opennebula/vdc_pool'
 require 'opennebula/system'
+require 'opennebula/virtual_router'
+require 'opennebula/virtual_router_pool'
+require 'opennebula/marketplace'
+require 'opennebula/marketplace_pool'
+require 'opennebula/marketplaceapp'
+require 'opennebula/marketplaceapp_pool'
 
 module OpenNebula
 
     # OpenNebula version
-    VERSION = '4.14.2'
+    VERSION = '4.90.0'
 end

data/lib/opennebula/acl.rb

@@ -1,5 +1,5 @@
 # -------------------------------------------------------------------------- #
-# Copyright 2002-2015, OpenNebula Project, OpenNebula Systems                #
+# Copyright 2002-2016, OpenNebula Project, OpenNebula Systems                #
 #                                                                            #
 # 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    #
@@ -33,6 +33,9 @@ module OpenNebula
     #                  ACL
     #                  SECGROUP
     #                  VDC
+    #                  VROUTER
+    #                  MARKETPLACE
+    #                  MARKETPLACEAPP
     #     RIGHTS    -> + separated list
     #                  USE
     #                  MANAGE
@@ -49,19 +52,22 @@ module OpenNebula
 
         RESOURCES =
         {
-            "VM"            =>    0x1000000000,
-            "HOST"          =>    0x2000000000,
-            "NET"           =>    0x4000000000,
-            "IMAGE"         =>    0x8000000000,
-            "USER"          =>   0x10000000000,
-            "TEMPLATE"      =>   0x20000000000,
-            "GROUP"         =>   0x40000000000,
-            "DATASTORE"     =>  0x100000000000,
-            "CLUSTER"       =>  0x200000000000,
-            "DOCUMENT"      =>  0x400000000000,
-            "ZONE"          =>  0x800000000000,
-            "SECGROUP"      => 0x1000000000000,
-            "VDC"           => 0x2000000000000
+            "VM"            =>     0x1000000000,
+            "HOST"          =>     0x2000000000,
+            "NET"           =>     0x4000000000,
+            "IMAGE"         =>     0x8000000000,
+            "USER"          =>    0x10000000000,
+            "TEMPLATE"      =>    0x20000000000,
+            "GROUP"         =>    0x40000000000,
+            "DATASTORE"     =>   0x100000000000,
+            "CLUSTER"       =>   0x200000000000,
+            "DOCUMENT"      =>   0x400000000000,
+            "ZONE"          =>   0x800000000000,
+            "SECGROUP"      =>  0x1000000000000,
+            "VDC"           =>  0x2000000000000,
+            "VROUTER"       =>  0x4000000000000,
+            "MARKETPLACE"   =>  0x8000000000000,
+            "MARKETPLACEAPP"=> 0x10000000000000
         }
 
         RIGHTS =

data/lib/opennebula/acl_pool.rb

@@ -1,5 +1,5 @@
 # -------------------------------------------------------------------------- #
-# Copyright 2002-2015, OpenNebula Project, OpenNebula Systems                #
+# Copyright 2002-2016, OpenNebula Project, OpenNebula Systems                #
 #                                                                            #
 # 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    #

data/lib/opennebula/client.rb

@@ -1,5 +1,5 @@
 # -------------------------------------------------------------------------- #
-# Copyright 2002-2015, OpenNebula Project, OpenNebula Systems                #
+# Copyright 2002-2016, OpenNebula Project, OpenNebula Systems                #
 #                                                                            #
 # 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    #

data/lib/opennebula/cluster.rb

@@ -1,5 +1,5 @@
 # -------------------------------------------------------------------------- #
-# Copyright 2002-2015, OpenNebula Project, OpenNebula Systems                #
+# Copyright 2002-2016, OpenNebula Project, OpenNebula Systems                #
 #                                                                            #
 # 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    #

data/lib/opennebula/cluster_pool.rb

@@ -1,5 +1,5 @@
 # -------------------------------------------------------------------------- #
-# Copyright 2002-2015, OpenNebula Project, OpenNebula Systems                #
+# Copyright 2002-2016, OpenNebula Project, OpenNebula Systems                #
 #                                                                            #
 # 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    #

data/lib/opennebula/datastore.rb

@@ -1,5 +1,5 @@
 # -------------------------------------------------------------------------- #
-# Copyright 2002-2015, OpenNebula Project, OpenNebula Systems                #
+# Copyright 2002-2016, OpenNebula Project, OpenNebula Systems                #
 #                                                                            #
 # 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    #
@@ -85,7 +85,7 @@ module OpenNebula
         # Allocates a new Datastore in OpenNebula
         #
         # @param description [String] The template of the Datastore.
-        # @param cluster_id [Integer] Id of the cluster
+        # @param cluster_id [Integer] Id of the cluster, -1 to use default
         #
         # @return [Integer, OpenNebula::Error] the new ID in case of
         #   success, error otherwise

data/lib/opennebula/datastore_pool.rb

@@ -1,5 +1,5 @@
 # -------------------------------------------------------------------------- #
-# Copyright 2002-2015, OpenNebula Project, OpenNebula Systems                #
+# Copyright 2002-2016, OpenNebula Project, OpenNebula Systems                #
 #                                                                            #
 # 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    #
@@ -36,9 +36,9 @@ module OpenNebula
             super('DATASTORE_POOL','DATASTORE',client)
         end
 
-        # Factory method to create User objects
+        # Factory method to create datastore objects
         def factory(element_xml)
-            OpenNebula::Group.new(element_xml,@client)
+            OpenNebula::Datastore.new(element_xml,@client)
         end
 
         #######################################################################

data/lib/opennebula/document.rb

@@ -1,5 +1,5 @@
 # -------------------------------------------------------------------------- #
-# Copyright 2002-2015, OpenNebula Project, OpenNebula Systems                #
+# Copyright 2002-2016, OpenNebula Project, OpenNebula Systems                #
 #                                                                            #
 # 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    #
@@ -134,6 +134,21 @@ module OpenNebula
             super(DOCUMENT_METHODS[:update], new_template, append ? 1 : 0)
         end
 
+        # Replaces the raw template contents
+        #
+        # @param template [String] New template contents, in the form KEY = VAL
+        # @param append [true, false] True to append new attributes instead of
+        #   replace the whole template
+        #
+        # @return [nil, OpenNebula::Error] nil in case of success, Error
+        #   otherwise
+        def update_raw(template_raw, append=false)
+            rc = check_type()
+            return rc if OpenNebula.is_error?(rc)
+
+            return call(DOCUMENT_METHODS[:update], @pe_id, template_raw, append ? 1 : 0)
+        end
+
         # Changes the owner/group
         #
         # @param [Integer] uid the new owner id. Set to -1 to leave the current one

data/lib/opennebula/document_json.rb

@@ -1,5 +1,5 @@
 # -------------------------------------------------------------------------- #
-# Copyright 2002-2015, OpenNebula Project, OpenNebula Systems                #
+# Copyright 2002-2016, OpenNebula Project, OpenNebula Systems                #
 #                                                                            #
 # 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    #
@@ -70,6 +70,18 @@ module OpenNebula
             super(text, append)
         end
 
+        # Replaces the raw template contents
+        #
+        # @param template [String] New template contents, in the form KEY = VAL
+        # @param append [true, false] True to append new attributes instead of
+        #   replace the whole template
+        #
+        # @return [nil, OpenNebula::Error] nil in case of success, Error
+        #   otherwise
+        def update_raw(template_raw, append=false)
+            super(template_raw, append)
+        end
+
         # Generates a json representing the object
         #
         # @param [true, false] pretty_generate

data/lib/opennebula/document_pool.rb

@@ -1,5 +1,5 @@
 # -------------------------------------------------------------------------- #
-# Copyright 2002-2015, OpenNebula Project, OpenNebula Systems                #
+# Copyright 2002-2016, OpenNebula Project, OpenNebula Systems                #
 #                                                                            #
 # 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    #

data/lib/opennebula/document_pool_json.rb

@@ -1,5 +1,5 @@
 # -------------------------------------------------------------------------- #
-# Copyright 2002-2015, OpenNebula Project, OpenNebula Systems                #
+# Copyright 2002-2016, OpenNebula Project, OpenNebula Systems                #
 #                                                                            #
 # 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    #

data/lib/opennebula/error.rb

@@ -1,5 +1,5 @@
 # -------------------------------------------------------------------------- #
-# Copyright 2002-2015, OpenNebula Project, OpenNebula Systems                #
+# Copyright 2002-2016, OpenNebula Project, OpenNebula Systems                #
 #                                                                            #
 # 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    #

data/lib/opennebula/group.rb

@@ -1,5 +1,5 @@
 # -------------------------------------------------------------------------- #
-# Copyright 2002-2015, OpenNebula Project, OpenNebula Systems                #
+# Copyright 2002-2016, OpenNebula Project, OpenNebula Systems                #
 #                                                                            #
 # 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    #
@@ -37,7 +37,7 @@ module OpenNebula
         SELF = -1
 
         # Default resource ACL's for group users (create)
-        GROUP_DEFAULT_ACLS = "VM+IMAGE+TEMPLATE+DOCUMENT+SECGROUP"
+        GROUP_DEFAULT_ACLS = "VM+IMAGE+TEMPLATE+DOCUMENT+SECGROUP+VROUTER"
 
         # The default view for group and group admins, must be defined in
         # sunstone_views.yaml
@@ -139,31 +139,38 @@ module OpenNebula
                 return OpenNebula::Error.new(error_msg)
             end
 
-            str = ""
+            sunstone_attrs = []
 
             # Add Sunstone views for the group
             if group_hash[:views]
-                str += "SUNSTONE_VIEWS=\"#{group_hash[:views].join(",")}\"\n"
+                sunstone_attrs << "VIEWS=\"#{group_hash[:views].join(",")}\""
             end
 
             if group_hash[:default_view]
-                str += "DEFAULT_VIEW=\"#{group_hash[:default_view]}\"\n"
+                sunstone_attrs << "DEFAULT_VIEW=\"#{group_hash[:default_view]}\""
             end
 
             # And the admin views
             if group_hash[:admin_views]
-                str += "GROUP_ADMIN_VIEWS=\"#{group_hash[:admin_views].join(",")}\"\n"
+                sunstone_attrs << "GROUP_ADMIN_VIEWS=\"#{group_hash[:admin_views].join(",")}\""
             else
-                str += "GROUP_ADMIN_VIEWS=#{GROUP_ADMIN_SUNSTONE_VIEWS}\n"
+                sunstone_attrs << "GROUP_ADMIN_VIEWS=#{GROUP_ADMIN_SUNSTONE_VIEWS}"
             end
 
             if group_hash[:default_admin_view]
-                str += "GROUP_ADMIN_DEFAULT_VIEW=\"#{group_hash[:default_admin_view]}\"\n"
+                sunstone_attrs << "GROUP_ADMIN_DEFAULT_VIEW=\"#{group_hash[:default_admin_view]}\""
             else
-                str += "GROUP_ADMIN_DEFAULT_VIEW=#{GROUP_ADMIN_SUNSTONE_VIEWS}"
+                sunstone_attrs << "GROUP_ADMIN_DEFAULT_VIEW=#{GROUP_ADMIN_SUNSTONE_VIEWS}"
             end
 
-            self.update(str, true)
+            if sunstone_attrs.length > 0
+                rc = self.update("SUNSTONE=[#{sunstone_attrs.join(",\n")}]", true)
+                if OpenNebula.is_error?(rc)
+                    self.delete
+                    error_msg =  "Error updating group template: #{rc.message}"
+                    return OpenNebula::Error.new(error_msg)
+                end
+            end
 
             return 0
         end

data/lib/opennebula/group_pool.rb

@@ -1,5 +1,5 @@
 # -------------------------------------------------------------------------- #
-# Copyright 2002-2015, OpenNebula Project, OpenNebula Systems                #
+# Copyright 2002-2016, OpenNebula Project, OpenNebula Systems                #
 #                                                                            #
 # 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    #

data/lib/opennebula/host.rb

@@ -1,5 +1,5 @@
 # -------------------------------------------------------------------------- #
-# Copyright 2002-2015, OpenNebula Project, OpenNebula Systems                #
+# Copyright 2002-2016, OpenNebula Project, OpenNebula Systems                #
 #                                                                            #
 # 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    #
@@ -24,28 +24,35 @@ module OpenNebula
         # Constants and Class Methods
         #######################################################################
 
-
         HOST_METHODS = {
             :info       => "host.info",
             :allocate   => "host.allocate",
             :delete     => "host.delete",
-            :enable     => "host.enable",
+            :status     => "host.status",
             :update     => "host.update",
             :monitoring => "host.monitoring",
             :rename     => "host.rename"
         }
 
-        HOST_STATES=%w{INIT MONITORING_MONITORED MONITORED ERROR DISABLED MONITORING_ERROR MONITORING_INIT MONITORING_DISABLED}
+        HOST_STATES=%w{INIT MONITORING_MONITORED MONITORED ERROR DISABLED
+            MONITORING_ERROR MONITORING_INIT MONITORING_DISABLED OFFLINE}
 
         SHORT_HOST_STATES={
             "INIT"                 => "init",
             "MONITORING_MONITORED" => "update",
             "MONITORED"            => "on",
             "ERROR"                => "err",
-            "DISABLED"             => "off",
+            "DISABLED"             => "dsbl",
             "MONITORING_ERROR"     => "retry",
             "MONITORING_INIT"      => "init",
-            "MONITORING_DISABLED"  => "off"
+            "MONITORING_DISABLED"  => "dsbl",
+            "OFFLINE"              => "off"
+        }
+
+        HOST_STATUS={
+            "ENABLED"  => 0,
+            "DISABLED" => 1,
+            "OFFLINE"  => 2
         }
 
         # Creates a Host description with just its identifier
@@ -89,13 +96,12 @@ module OpenNebula
         # @param hostname [String] Name of the new Host.
         # @param im [String] Name of the im_driver (information/monitoring)
         # @param vmm [String] Name of the vmm_driver (hypervisor)
-        # @param vnm [String] Name of the vnm_driver (networking)
-        # @param cluster_id [String] Id of the cluster
+        # @param cluster_id [String] Id of the cluster, -1 to use default
         #
         # @return [Integer, OpenNebula::Error] the new ID in case of
         #   success, error otherwise
-        def allocate(hostname,im,vmm,vnm,cluster_id=ClusterPool::NONE_CLUSTER_ID)
-            super(HOST_METHODS[:allocate],hostname,im,vmm,vnm,cluster_id)
+        def allocate(hostname, im, vmm, cluster_id=ClusterPool::NONE_CLUSTER_ID)
+            super(HOST_METHODS[:allocate], hostname, im, vmm, cluster_id)
         end
 
         # Deletes the Host
@@ -105,12 +111,17 @@ module OpenNebula
 
         # Enables the Host
         def enable()
-            set_enabled(true)
+            set_status("ENABLED")
         end
 
         # Disables the Host
         def disable()
-            set_enabled(false)
+            set_status("DISABLED")
+        end
+
+        # Sets the Host offline
+        def offline()
+            set_status("OFFLINE")
         end
 
         def flush()
@@ -217,6 +228,7 @@ module OpenNebula
             return rc if OpenNebula.is_error?(rc)
 
             vm.deploy(id, false)
+            return vm.id
         end
 
         #######################################################################
@@ -255,10 +267,10 @@ module OpenNebula
         end
 
     private
-        def set_enabled(enabled)
+        def set_status(status)
             return Error.new('ID not defined') if !@pe_id
 
-            rc = @client.call(HOST_METHODS[:enable], @pe_id, enabled)
+            rc = @client.call(HOST_METHODS[:status], @pe_id, HOST_STATUS[status])
             rc = nil if !OpenNebula.is_error?(rc)
 
             return rc

data/lib/opennebula/host_pool.rb

@@ -1,5 +1,5 @@
 # -------------------------------------------------------------------------- #
-# Copyright 2002-2015, OpenNebula Project, OpenNebula Systems                #
+# Copyright 2002-2016, OpenNebula Project, OpenNebula Systems                #
 #                                                                            #
 # 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    #