opennebula-cli 5.12.9 → 6.0.0.1

data/bin/onehook

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 
 # -------------------------------------------------------------------------- #
-# Copyright 2002-2020, OpenNebula Project, OpenNebula Systems                #
+# Copyright 2002-2021, 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    #
@@ -27,9 +27,12 @@ else
 end
 
 if File.directory?(GEMS_LOCATION)
-    $LOAD_PATH.reject! {|l| l =~ /vendor_ruby/ }
-    require 'rubygems'
-    Gem.use_paths(File.realpath(GEMS_LOCATION))
+    real_gems_path = File.realpath(GEMS_LOCATION)
+    if !defined?(Gem) || Gem.path != [real_gems_path]
+        $LOAD_PATH.reject! {|l| l =~ /vendor_ruby/ }
+        require 'rubygems'
+        Gem.use_paths(real_gems_path)
+    end
 end
 
 $LOAD_PATH << RUBY_LIB_LOCATION
@@ -133,8 +136,8 @@ CommandParser::CmdParser.new(ARGV) do
     ########################################################################
     set :option, CommandParser::OPTIONS + OpenNebulaHelper::CLIENT_OPTIONS
 
-    list_options = CLIHelper::OPTIONS
-    list_options << OpenNebulaHelper::XML
+    list_options  = CLIHelper::OPTIONS
+    list_options += OpenNebulaHelper::FORMAT
     list_options << OpenNebulaHelper::NUMERIC
     list_options << OpenNebulaHelper::DESCRIBE
 
@@ -228,7 +231,7 @@ CommandParser::CmdParser.new(ARGV) do
     EOT
 
     command :show, show_desc, :hookid,
-            :options => [OpenNebulaHelper::XML, OpenNebulaHelper::EXTENDED,
+            :options => [OpenNebulaHelper::FORMAT, OpenNebulaHelper::EXTENDED,
                          EXECUTION] do
         helper.show_resource(args[0], options)
     end

data/bin/onehost

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 
 # -------------------------------------------------------------------------- #
-# Copyright 2002-2020, OpenNebula Project, OpenNebula Systems                #
+# Copyright 2002-2021, 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    #
@@ -29,9 +29,12 @@ else
 end
 
 if File.directory?(GEMS_LOCATION)
-    $LOAD_PATH.reject! {|l| l =~ /vendor_ruby/ }
-    require 'rubygems'
-    Gem.use_paths(File.realpath(GEMS_LOCATION))
+    real_gems_path = File.realpath(GEMS_LOCATION)
+    if !defined?(Gem) || Gem.path != [real_gems_path]
+        $LOAD_PATH.reject! {|l| l =~ /vendor_ruby/ }
+        require 'rubygems'
+        Gem.use_paths(real_gems_path)
+    end
 end
 
 $LOAD_PATH << RUBY_LIB_LOCATION
@@ -168,8 +171,8 @@ CommandParser::CmdParser.new(ARGV) do
             [:file, nil], :options => CREAT_OPTIONS do
         if options[:im].nil? || options[:vm].nil?
             STDERR.puts 'Drivers are mandatory to create a host:'
-            STDERR.puts '\t -i information driver'
-            STDERR.puts '\t -v hypervisor driver'
+            STDERR.puts "\t -i information driver"
+            STDERR.puts "\t -v hypervisor driver"
             exit(-1)
         end
 
@@ -283,7 +286,7 @@ CommandParser::CmdParser.new(ARGV) do
     EOT
 
     command :show, show_desc, :hostid,
-            :options => [OpenNebulaHelper::XML, OpenNebulaHelper::DECRYPT] do
+            :options => [OpenNebulaHelper::FORMAT, OpenNebulaHelper::DECRYPT] do
         helper.show_resource(args[0], options)
     end
 

data/bin/oneimage

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 
 # -------------------------------------------------------------------------- #
-# Copyright 2002-2020, OpenNebula Project, OpenNebula Systems                #
+# Copyright 2002-2021, 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    #
@@ -27,14 +27,18 @@ else
 end
 
 if File.directory?(GEMS_LOCATION)
-    $LOAD_PATH.reject! {|l| l =~ /vendor_ruby/ }
-    require 'rubygems'
-    Gem.use_paths(File.realpath(GEMS_LOCATION))
+    real_gems_path = File.realpath(GEMS_LOCATION)
+    if !defined?(Gem) || Gem.path != [real_gems_path]
+        $LOAD_PATH.reject! {|l| l =~ /vendor_ruby/ }
+        require 'rubygems'
+        Gem.use_paths(real_gems_path)
+    end
 end
 
 $LOAD_PATH << RUBY_LIB_LOCATION
 $LOAD_PATH << RUBY_LIB_LOCATION + '/cli'
 
+require 'tempfile'
 require 'command_parser'
 require 'one_helper/oneimage_helper'
 require 'one_helper/onedatastore_helper'
@@ -73,17 +77,25 @@ CommandParser::CmdParser.new(ARGV) do
         :description => 'lock all actions'
     }
 
+    NO_CONTEXT = {
+        :name => 'no_context',
+        :large => '--no-context',
+        :description => 'Do not add context when building from Dockerfile'
+    }
+
     ########################################################################
     # Global Options
     ########################################################################
     set :option, CommandParser::OPTIONS + OpenNebulaHelper::CLIENT_OPTIONS
 
-    list_options = CLIHelper::OPTIONS
-    list_options << OpenNebulaHelper::XML
+    list_options  = CLIHelper::OPTIONS
+    list_options += OpenNebulaHelper::FORMAT
     list_options << OpenNebulaHelper::NUMERIC
     list_options << OpenNebulaHelper::DESCRIBE
 
-    CREATE_OPTIONS = [OneDatastoreHelper::DATASTORE, OneImageHelper::IMAGE]
+    CREATE_OPTIONS = [OneDatastoreHelper::DATASTORE,
+                      OneImageHelper::IMAGE,
+                      NO_CONTEXT]
 
     ########################################################################
     # Formatters for arguments
@@ -152,7 +164,7 @@ CommandParser::CmdParser.new(ARGV) do
             :options => CREATE_OPTIONS + OneImageHelper::TEMPLATE_OPTIONS do
         if options[:datastore].nil? && !options[:dry]
             STDERR.puts 'Datastore to save the image is mandatory: '
-            STDERR.puts '\t -d datastore_id'
+            STDERR.puts "\t -d datastore_id"
             exit(-1)
         end
 
@@ -168,6 +180,15 @@ CommandParser::CmdParser.new(ARGV) do
             next -1
         end
 
+        # Add context information when building image (just working on Docker)
+        if (options.key? :no_context) && options[:path]
+            if options[:path].include?('?')
+                options[:path] << '&context=no'
+            else
+                options[:path] << '?context=no'
+            end
+        end
+
         helper.create_resource(options) do |image|
             begin
                 if args[0]
@@ -390,7 +411,8 @@ CommandParser::CmdParser.new(ARGV) do
         Shows information for the given Image
     EOT
 
-    command :show, show_desc, :imageid, :options => OpenNebulaHelper::XML do
+    command :show, show_desc, :imageid,
+            :options => [OpenNebulaHelper::FORMAT, OpenNebulaHelper::DECRYPT] do
         helper.show_resource(args[0], options)
     end
 
@@ -450,4 +472,73 @@ CommandParser::CmdParser.new(ARGV) do
 
         return 0
     end
+
+    dockerfile_desc = <<-EOT.unindent
+        Create an image based on a Dockerfile
+    EOT
+
+    command :dockerfile,
+            dockerfile_desc,
+            :options => CREATE_OPTIONS +
+                        OneImageHelper::TEMPLATE_OPTIONS do
+        # Check user options
+        unless options[:datastore]
+            STDERR.puts 'Datastore to save the image is mandatory: '
+            STDERR.puts "\t -d datastore_id"
+            exit(-1)
+        end
+
+        unless options[:name]
+            STDERR.puts 'No name provided'
+            exit(-1)
+        end
+
+        unless options[:size]
+            STDERR.puts 'No size given'
+            exit(-1)
+        end
+
+        # Prepare editor
+        tmp = Tempfile.new('dockerfile')
+
+        if ENV['EDITOR']
+            editor_path = ENV['EDITOR']
+        else
+            editor_path = EDITOR_PATH
+        end
+
+        system("#{editor_path} #{tmp.path}")
+
+        unless $CHILD_STATUS.exitstatus.zero?
+            STDERR.puts('Editor not defined')
+            exit(-1)
+        end
+
+        tmp.close
+
+        # Create image
+        helper.create_resource(options) do |image|
+            begin
+                b64            = Base64.strict_encode64(File.read(tmp.path))
+                options[:path] = "dockerfile:///?fileb64=#{b64}&" \
+                                 "size=#{options[:size]}"
+
+                options[:path] << '&context=no' if options.key?(:no_context)
+
+                res = OneImageHelper.create_image_template(options)
+
+                if res.first != 0
+                    STDERR.puts res.last
+                    next -1
+                end
+
+                template = res.last
+
+                image.allocate(template, options[:datastore], false)
+            rescue StandardError => e
+                STDERR.puts e.message
+                exit(-1)
+            end
+        end
+    end
 end

data/bin/onemarket

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 
 # -------------------------------------------------------------------------- #
-# Copyright 2002-2020, OpenNebula Project, OpenNebula Systems                #
+# Copyright 2002-2021, 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    #
@@ -27,9 +27,12 @@ else
 end
 
 if File.directory?(GEMS_LOCATION)
-    $LOAD_PATH.reject! {|l| l =~ /vendor_ruby/ }
-    require 'rubygems'
-    Gem.use_paths(File.realpath(GEMS_LOCATION))
+    real_gems_path = File.realpath(GEMS_LOCATION)
+    if !defined?(Gem) || Gem.path != [real_gems_path]
+        $LOAD_PATH.reject! {|l| l =~ /vendor_ruby/ }
+        require 'rubygems'
+        Gem.use_paths(real_gems_path)
+    end
 end
 
 $LOAD_PATH << RUBY_LIB_LOCATION
@@ -53,8 +56,8 @@ CommandParser::CmdParser.new(ARGV) do
     ########################################################################
     set :option, CommandParser::OPTIONS + OpenNebulaHelper::CLIENT_OPTIONS
 
-    list_options = CLIHelper::OPTIONS
-    list_options << OpenNebulaHelper::XML
+    list_options  = CLIHelper::OPTIONS
+    list_options += OpenNebulaHelper::FORMAT
     list_options << OpenNebulaHelper::NUMERIC
     list_options << OpenNebulaHelper::DESCRIBE
 
@@ -154,7 +157,7 @@ CommandParser::CmdParser.new(ARGV) do
     EOT
 
     command :show, show_desc,
-            :marketplaceid, :options => OpenNebulaHelper::XML do
+            :marketplaceid, :options => OpenNebulaHelper::FORMAT do
         helper.show_resource(args[0], options)
     end
 

data/bin/onemarketapp

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 
 # -------------------------------------------------------------------------- #
-# Copyright 2002-2020, OpenNebula Project, OpenNebula Systems                #
+# Copyright 2002-2021, 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    #
@@ -29,9 +29,12 @@ else
 end
 
 if File.directory?(GEMS_LOCATION)
-    $LOAD_PATH.reject! {|l| l =~ /vendor_ruby/ }
-    require 'rubygems'
-    Gem.use_paths(File.realpath(GEMS_LOCATION))
+    real_gems_path = File.realpath(GEMS_LOCATION)
+    if !defined?(Gem) || Gem.path != [real_gems_path]
+        $LOAD_PATH.reject! {|l| l =~ /vendor_ruby/ }
+        require 'rubygems'
+        Gem.use_paths(real_gems_path)
+    end
 end
 
 $LOAD_PATH << RUBY_LIB_LOCATION
@@ -83,20 +86,56 @@ CommandParser::CmdParser.new(ARGV) do
         :description => 'DockerHub image tag (default latest)'
     }
 
+    YES = {
+        :name => 'yes',
+        :large => '--yes',
+        :description => 'Import associated VM templates/images',
+        :proc => lambda do |_, options|
+            options[:yes] = 'yes'
+        end
+    }
+
+    NO = {
+        :name => 'no',
+        :large => '--no',
+        :description => 'Do not import/export associated VM templates/images',
+        :proc => lambda do |_, options|
+            options[:no] = 'no'
+        end
+    }
+
+    TEMPLATE = {
+        :name => 'template',
+        :large => '--template template_id ',
+        :description => 'Associate with VM template',
+        :format => Integer
+    }
+
+    MARKET = {
+        :name => 'market',
+        :large => '--market market_id',
+        :format => Integer,
+        :description => 'Market to import all objects'
+    }
+
     ########################################################################
     # Global Options
     ########################################################################
     set :option, CommandParser::OPTIONS + OpenNebulaHelper::CLIENT_OPTIONS
 
-    list_options = CLIHelper::OPTIONS
-    list_options << OpenNebulaHelper::XML
+    list_options  = CLIHelper::OPTIONS
+    list_options += OpenNebulaHelper::FORMAT
     list_options << OpenNebulaHelper::NUMERIC
     list_options << OpenNebulaHelper::DESCRIBE
 
     CREATE_OPTIONS = [OneMarketPlaceHelper::MARKETPLACE]
     EXPORT_OPTIONS = [OneDatastoreHelper::DATASTORE,
+                      OneDatastoreHelper::FILE_DATASTORE,
                       OneMarketPlaceAppHelper::VMNAME,
-                      TAG]
+                      TAG,
+                      NO,
+                      TEMPLATE]
+    IMPORT_OPTIONS = [YES, NO, MARKET, OneMarketPlaceAppHelper::VMNAME]
 
     ########################################################################
     # Formatters for arguments
@@ -135,7 +174,7 @@ CommandParser::CmdParser.new(ARGV) do
                         OneMarketPlaceAppHelper::TEMPLATE_OPTIONS do
         if options[:marketplace].nil?
             STDERR.puts 'Marketplace to save the app is mandatory: '
-            STDERR.puts '\t -m marketplace_id'
+            STDERR.puts "\t -m marketplace_id"
             exit(-1)
         end
 
@@ -175,6 +214,60 @@ CommandParser::CmdParser.new(ARGV) do
         end
     end
 
+    import_desc = <<-EOT.unindent
+        Imports a service template into the marketplace
+    EOT
+
+    command [:'service-template', :import],
+            import_desc,
+            :service_template_id,
+            :options => IMPORT_OPTIONS do
+        helper.import(args[0], ServiceTemplate) do |id|
+            helper.import_service_template(id, options)
+        end
+    end
+
+    vm_import_desc = <<-EOT.unindent
+        Imports a VM template into the marketplace
+    EOT
+
+    command [:'vm-template', :import],
+            vm_import_desc,
+            :vm_template_id,
+            :options => IMPORT_OPTIONS do
+        helper.import(args[0], TemplatePool) do |id|
+            helper.import_vm_template(id, options)
+        end
+    end
+
+    vm_import_desc = <<-EOT.unindent
+        Imports a VM into the marketplace
+    EOT
+
+    command [:vm, :import],
+            vm_import_desc,
+            :vm_id,
+            :options => IMPORT_OPTIONS do
+        t_id = helper.save_as_template(
+            helper.get_obj_id(args[0], VirtualMachinePool)
+        )
+
+        if OpenNebula.is_error?(t_id)
+            STDERR.puts t_id.message
+            exit(-1)
+        else
+            helper.import(t_id, TemplatePool) do |id|
+                helper.import_vm_template(id, options)
+            end
+        end
+
+        puts
+        puts 'To delete saved template use: ' \
+             "`onetemplate delete #{t_id} --recursive`"
+
+        0
+    end
+
     export_desc = <<-EOT.unindent
         Exports the marketplace app to the OpenNebula cloud
     EOT
@@ -183,20 +276,30 @@ CommandParser::CmdParser.new(ARGV) do
         helper.perform_action(args[0], options, 'exported') do |obj|
             tag ="tag=#{options[:tag]}" if options[:tag]
 
+            obj.extend(MarketPlaceAppExt)
+
             rc = obj.export(
                 :dsid => options[:datastore],
                 :name => args[1],
                 :vmtemplate_name => options[:vmname],
-                :url_args => tag
+                :url_args => tag,
+                :notemplate => options[:no] == 'no',
+                :template => options[:template]
             )
 
-            next rc if OpenNebula.is_error?(rc)
+            if OpenNebula.is_error?(rc)
+                STDERR.puts rc.message
+                exit(-1)
+            end
 
             rc.each  do |key, value|
+                next if value.nil? || value.empty? || key == :image_type
+
                 puts key.to_s.upcase
                 value.each do |id|
                     if OpenNebula.is_error?(id)
                         puts id.to_str
+                        exit(-1)
                     else
                         puts "    ID: #{id}"
                     end
@@ -300,7 +403,7 @@ CommandParser::CmdParser.new(ARGV) do
         Shows information for the given marketplace app
     EOT
 
-    command :show, show_desc, :appid, :options => OpenNebulaHelper::XML do
+    command :show, show_desc, :appid, :options => OpenNebulaHelper::FORMAT do
         helper.show_resource(args[0], options)
     end