opennebula-cli 4.14.2 → 4.90.0.beta1

data/lib/one_helper/onemarket_helper.rb

@@ -0,0 +1,152 @@
+# -------------------------------------------------------------------------- #
+# 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    #
+# 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 'one_helper'
+
+class OneMarketPlaceHelper < OpenNebulaHelper::OneHelper
+    MARKETPLACE = {
+        :name   => "marketplace",
+        :short  => "-m id|name",
+        :large  => "--marketplace id|name" ,
+        :description => "Selects the marketplace",
+        :format => String,
+        :proc   => lambda { |o, options|
+            OpenNebulaHelper.rname_to_id(o, "MARKETPLACE")
+        }
+    }
+
+    def self.rname
+        "MARKETPLACE"
+    end
+
+    def self.conf_file
+        "onemarket.yaml"
+    end
+
+    def format_pool(options)
+        config_file = self.class.table_conf
+
+        table = CLIHelper::ShowTable.new(config_file, self) do
+            column :ID, "ONE identifier for the Marketplace", :size=>4 do |d|
+                d["ID"]
+            end
+
+            column :USER, "Username of the Marketplace owner", :left,
+                    :size=>10 do |d|
+                helper.user_name(d, options)
+            end
+
+            column :GROUP, "Group of the Marketplace", :left,
+                    :size=>10 do |d|
+                helper.group_name(d, options)
+            end
+
+            column :NAME, "Name of the Marketplace", :left, :size=>30 do |d|
+                d["NAME"]
+            end
+
+            column :SIZE, "Marketplace total size", :size =>10 do |d|
+                OpenNebulaHelper.unit_to_str(d['TOTAL_MB'].to_i, {}, 'M')
+            end
+
+            column :AVAIL, "Marketplace free size", :left, :size =>10 do |d|
+                if d['TOTAL_MB'].to_i == 0
+                    "-"
+                else
+                    "#{((d['FREE_MB'].to_f/d['TOTAL_MB'].to_f) * 100).round()}%"
+                end
+            end
+
+            column :APPS, "Number of marketplace apps", :size=>6 do |d|
+                if d["MARKETPLACEAPPS"]["ID"].nil?
+                    "0"
+                else
+                    [d["MARKETPLACEAPPS"]["ID"]].flatten.size
+                end
+            end
+
+            column :MAD, "Marketplace driver", :left, :size=>7 do |d|
+                d["MARKET_MAD"]
+            end
+
+            column :ZONE, "Zone ID", :size=>4 do |d|
+                d["ZONE_ID"]
+            end
+
+            default :ID, :NAME, :SIZE, :AVAIL, :APPS, :MAD, :ZONE
+        end
+
+        table
+    end
+
+    private
+
+    def factory(id=nil)
+        if id
+            OpenNebula::MarketPlace.new_with_id(id, @client)
+        else
+            xml=OpenNebula::MarketPlace.build_xml
+            OpenNebula::MarketPlace.new(xml, @client)
+        end
+    end
+
+    def factory_pool(user_flag=-2)
+        OpenNebula::MarketPlacePool.new(@client)
+    end
+
+    def format_resource(market, options = {})
+        str="%-15s: %-20s"
+        str_h1="%-80s"
+
+        CLIHelper.print_header(str_h1 % "MARKETPLACE #{market['ID']} INFORMATION")
+        puts str % ["ID",    market.id.to_s]
+        puts str % ["NAME",  market.name]
+        puts str % ["USER",  market['UNAME']]
+        puts str % ["GROUP", market['GNAME']]
+
+        puts str % ["MARKET_MAD", market['MARKET_MAD']]
+        puts
+
+        CLIHelper.print_header(str_h1 % "MARKETPLACE CAPACITY", false)
+
+        puts str % ["TOTAL:", OpenNebulaHelper.unit_to_str(market['TOTAL_MB'].to_i,{},'M')]
+        puts str % ["FREE:",  OpenNebulaHelper.unit_to_str(market['FREE_MB'].to_i, {},'M')]
+        puts str % ["USED: ", OpenNebulaHelper.unit_to_str(market['USED_MB'].to_i, {},'M')]
+        puts
+
+        CLIHelper.print_header(str_h1 % "PERMISSIONS",false)
+
+        ["OWNER", "GROUP", "OTHER"].each { |e|
+            mask = "---"
+            mask[0] = "u" if market["PERMISSIONS/#{e}_U"] == "1"
+            mask[1] = "m" if market["PERMISSIONS/#{e}_M"] == "1"
+            mask[2] = "a" if market["PERMISSIONS/#{e}_A"] == "1"
+
+            puts str % [e,  mask]
+        }
+        puts
+
+        CLIHelper.print_header(str_h1 % "MARKETPLACE TEMPLATE", false)
+        puts market.template_str
+
+        puts
+
+        CLIHelper.print_header("%-15s" % "MARKETAPPS")
+        market.marketapp_ids.each do |id|
+            puts "%-15s" % [id]
+        end
+    end
+end

data/lib/one_helper/onemarketapp_helper.rb

@@ -0,0 +1,223 @@
+# -------------------------------------------------------------------------- #
+# 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    #
+# 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 'one_helper'
+
+class OneMarketPlaceAppHelper < OpenNebulaHelper::OneHelper
+    TEMPLATE_OPTIONS=[
+        {
+            :name        => "name",
+            :large       => "--name name",
+            :format      => String,
+            :description => "Name of the new MarketPlaceApp"
+        },
+        {
+            :name        => "description",
+            :large       => "--description description",
+            :format      => String,
+            :description => "Description for the new MarketPlaceApp"
+        },
+        {
+            :name         => "image",
+            :large        => "--image id|name" ,
+            :description  => "Selects the image",
+            :format       => String,
+            :template_key => "origin_id",
+            :proc         => lambda { |o, options|
+                OpenNebulaHelper.rname_to_id(o, "IMAGE")
+            }
+        },
+        OpenNebulaHelper::DRY
+    ]
+
+    VMNAME = {
+        :name   => "vmname",
+        :large  => "--vmname name" ,
+        :description => "Selects the name for the new VM Template, if the App contains one",
+        :format => String
+    }
+
+    def self.rname
+        "MARKETPLACEAPP"
+    end
+
+    def self.conf_file
+        "onemarketapp.yaml"
+    end
+
+    def self.state_to_str(id)
+        id = id.to_i
+        state_str = MarketPlaceApp::MARKETPLACEAPP_STATES[id]
+        return MarketPlaceApp::SHORT_MARKETPLACEAPP_STATES[state_str]
+    end
+
+    def format_pool(options)
+        config_file = self.class.table_conf
+
+        table = CLIHelper::ShowTable.new(config_file, self) do
+            column :ID, "ONE identifier for the marketplace app", :size=>4 do |d|
+                d["ID"]
+            end
+
+            column :NAME, "Name of the marketplace app", :left, :size=>25 do |d|
+                d["NAME"]
+            end
+
+            column :VERSION, "Version of the app", :size=>10 do |d|
+                d["VERSION"]
+            end
+
+            column :SIZE, "App size", :size =>5 do |d|
+                OpenNebulaHelper.unit_to_str(d['SIZE'].to_i, {}, 'M')
+            end
+
+            column :STAT, "State of the app", :size=>4 do |d|
+                OneMarketPlaceAppHelper.state_to_str(d["STATE"])
+            end
+
+            column :REGTIME, "Registration time of the app", :size=>8 do |d|
+                Time.at(d['REGTIME'].to_i).strftime("%D")
+            end
+
+            column :TYPE, "Marketplace app type", :size=>4 do |d|
+                type = MarketPlaceApp::MARKETPLACEAPP_TYPES[d["TYPE"].to_i]
+                MarketPlaceApp::SHORT_MARKETPLACEAPP_TYPES[type]
+            end
+
+            column :MARKET, "Name of the MarketPlace", :left, :size=>20 do |d|
+                d["MARKETPLACE"]
+            end
+
+            column :ZONE, "Zone ID", :size=>4 do |d|
+                d["ZONE_ID"]
+            end
+
+            default :ID,:NAME,:VERSION,:SIZE,:STAT,:TYPE,:REGTIME,:MARKET,:ZONE
+        end
+
+        table
+    end
+
+    def self.create_template_options_used?(options)
+        # Get the template options names as symbols. options hash
+        # uses symbols
+        template_options=self::TEMPLATE_OPTIONS.map do |o|
+            o[:name].to_sym
+        end
+
+        # Check if one at least one of the template options is
+        # in options hash
+        (template_options-options.keys)!=template_options
+    end
+
+    private
+
+    def factory(id=nil)
+        if id
+            OpenNebula::MarketPlaceApp.new_with_id(id, @client)
+        else
+            xml=OpenNebula::MarketPlaceApp.build_xml
+            OpenNebula::MarketPlaceApp.new(xml, @client)
+        end
+    end
+
+    def factory_pool(user_flag=-2)
+        OpenNebula::MarketPlaceAppPool.new(@client, user_flag)
+    end
+
+    def format_resource(app, options = {})
+        str="%-15s: %-20s"
+        str_h1="%-80s"
+
+        CLIHelper.print_header(str_h1 % "MARKETPLACE APP #{app['ID']} INFORMATION")
+        puts str % ["ID",    app.id.to_s]
+        puts str % ["NAME",  app.name]
+        puts str % ["TYPE",  app.type_str]
+        puts str % ["USER",  app['UNAME']]
+        puts str % ["GROUP", app['GNAME']]
+        puts str % ["MARKETPLACE", app['MARKETPLACE']]
+        puts str % ["STATE", OneMarketPlaceAppHelper.state_to_str(app["STATE"])]
+
+        puts
+
+        CLIHelper.print_header(str_h1 % "PERMISSIONS",false)
+
+        ["OWNER", "GROUP", "OTHER"].each { |e|
+            mask = "---"
+            mask[0] = "u" if app["PERMISSIONS/#{e}_U"] == "1"
+            mask[1] = "m" if app["PERMISSIONS/#{e}_M"] == "1"
+            mask[2] = "a" if app["PERMISSIONS/#{e}_A"] == "1"
+
+            puts str % [e, mask]
+        }
+        puts
+
+        CLIHelper.print_header(str_h1 % "DETAILS", false)
+
+        puts str % ["SOURCE", app['SOURCE']]
+        puts str % ["MD5", app['MD5']]
+        puts str % ["PUBLISHER", app['PUBLISHER']]
+        puts str % ["REGISTER TIME", Time.at(app['REGTIME'].to_i).strftime("%c") ]
+        puts str % ["VERSION", app['VERSION']]
+        puts str % ["DESCRIPTION", app['DESCRIPTION']]
+        puts str % ["SIZE", OpenNebulaHelper.unit_to_str(app['SIZE'].to_i,{},'M')]
+        puts str % ["ORIGIN_ID", app['ORIGIN_ID']]
+        puts str % ["FORMAT", app['FORMAT']]
+
+        puts
+
+        CLIHelper.print_header(str_h1 % "IMPORT TEMPLATE", false)
+
+        puts Base64.decode64(app['APPTEMPLATE64'])
+
+        puts
+
+        CLIHelper.print_header(str_h1 % "MARKETPLACE APP TEMPLATE", false)
+        puts app.template_str
+
+        puts
+    end
+
+    def self.create_variables(options, name)
+        if Array===name
+            names=name
+        else
+            names=[name]
+        end
+
+        t=''
+        names.each do |n|
+            if options[n]
+                t<<"#{n.to_s.upcase}=\"#{options[n]}\"\n"
+            end
+        end
+
+        t
+    end
+
+    def self.create_datastore_template(options)
+        template_options=TEMPLATE_OPTIONS.map do |o|
+            o[:name].to_sym
+        end
+
+        template=create_variables(options, template_options-[:dry,:image])
+
+        template<<"ORIGIN_ID=#{options[:image]}\n" if options[:image]
+        template << "TYPE=image\n"
+
+        [0, template]
+    end
+end

data/lib/one_helper/onequota_helper.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/one_helper/onesecgroup_helper.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    #
@@ -17,6 +17,15 @@
 require 'one_helper'
 
 class OneSecurityGroupHelper < OpenNebulaHelper::OneHelper
+    RECOVER = {
+        :name   => "recover",
+        :short  => "-r",
+        :large  => "--recover" ,
+        :description => "If set the commit operation will only operate on "\
+            "outdated and error VMs. This is intended for retrying updates of "\
+            "VMs or reinitialize the updating process if oned stopped or fail.",
+    }
+
     def self.rname
         "SECURITY_GROUP"
     end
@@ -33,7 +42,7 @@ class OneSecurityGroupHelper < OpenNebulaHelper::OneHelper
                 d["ID"]
             end
 
-            column :NAME, "Name of the Security Group", :left, :size=>27 do |d|
+            column :NAME, "Name of the Security Group", :left, :size=>20 do |d|
                 d["NAME"]
             end
 
@@ -46,7 +55,31 @@ class OneSecurityGroupHelper < OpenNebulaHelper::OneHelper
                 helper.group_name(d, options)
             end
 
-            default :ID, :USER, :GROUP, :NAME
+            column :UPDATED, "Number of VMs with updated rules", :size=>8 do |d|
+                if d["UPDATED_VMS"]["ID"].nil?
+                    "0"
+                else
+                    [d["UPDATED_VMS"]["ID"]].flatten.size
+                end
+            end
+
+            column :OUTDATED, "Number of VMs with outdated rules", :size=>8 do |d|
+                if d["OUTDATED_VMS"]["ID"].nil?
+                    "0"
+                else
+                    [d["OUTDATED_VMS"]["ID"]].flatten.size
+                end
+            end
+
+            column :ERROR, "Number of VMs that failed to update rules", :size=>8 do |d|
+                if d["ERROR_VMS"]["ID"].nil?
+                    "0"
+                else
+                    [d["ERROR_VMS"]["ID"]].flatten.size
+                end
+            end
+
+            default :ID, :USER, :GROUP, :NAME, :UPDATED, :OUTDATED, :ERROR
         end
 
         table
@@ -91,6 +124,16 @@ class OneSecurityGroupHelper < OpenNebulaHelper::OneHelper
 
         puts
 
+        CLIHelper.print_header(str_h1 % "VIRTUAL MACHINES", false)
+
+        updated, outdated, error = secgroup.vm_ids
+
+        puts str % ["UPDATED", updated.join(',') ]
+        puts str % ["OUTDATED", outdated.join(',') ]
+        puts str % ["ERROR", error.join(',') ]
+
+        puts
+
         CLIHelper.print_header(str_h1 % ["RULES"], false)
 
         if !secgroup.to_hash['SECURITY_GROUP']['TEMPLATE']['RULE'].nil?

data/lib/one_helper/onetemplate_helper.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    #
@@ -51,6 +51,20 @@ EOT
                         "information, such as the SIZE for each DISK"
     }
 
+    RECURSIVE={
+        :name => "recursive",
+        :large => "--recursive",
+        :description => "Applies the action to the template plus any "+
+        "image defined in DISK"
+    }
+
+    PERSISTENT={
+        :name => "persistent",
+        :large => "--persistent",
+        :description => "Creates a private persistent copy of the template "+
+        "plus any image defined in DISK, and instantiates that copy"
+    }
+
     def self.rname
         "VMTEMPLATE"
     end
@@ -111,7 +125,10 @@ EOT
         table
     end
 
-    def get_user_inputs(template)
+    INT_EXP = /^-?\d+$/
+    FLOAT_EXP = /^-?\d+(\.\d+)?$/
+
+    def self.get_user_inputs(template)
         user_inputs = template['VMTEMPLATE']['TEMPLATE']['USER_INPUTS']
 
         return "" if !user_inputs
@@ -121,23 +138,41 @@ EOT
         puts "There are some parameters that require user input. Use the string <<EDITOR>> to launch an editor (e.g. for multi-line inputs)"
 
         user_inputs.each do |key, val|
-            input_cfg = val.split('|')
+            input_cfg = val.split('|', -1)
 
-            if input_cfg.length != 3
-                STDERR.puts "Malformed user input. It should have 3 parts separated by '|':"
+            if input_cfg.length < 3
+                STDERR.puts "Malformed user input. It should have at least 3 parts separated by '|':"
                 STDERR.puts "  #{key}: #{val}"
                 exit(-1)
             end
 
-            optional, type, description = input_cfg
-            optional.strip!
+            mandatory, type, description, params, initial = input_cfg
+            optional = mandatory.strip == "O"
             type.strip!
             description.strip!
 
-            print "  * (#{key}) #{description}: "
+            if input_cfg.length > 3
+                if input_cfg.length != 5
+                    STDERR.puts "Malformed user input. It should have 5 parts separated by '|':"
+                    STDERR.puts "  #{key}: #{val}"
+                    exit(-1)
+                end
+
+                params.strip!
+                initial.strip!
+            end
+
+            puts "  * (#{key}) #{description}"
+
+            header = "    "
+            if initial != nil && initial != ""
+                header += "Press enter for default (#{initial}). "
+            end
 
             case type
             when 'text', 'text64'
+                print header
+
                 answer = STDIN.readline.chop
 
                 if answer == "<<EDITOR>>"
@@ -147,15 +182,115 @@ EOT
                 if type == 'text64'
                     answer = Base64::encode64(answer).strip.delete("\n")
                 end
+
             when 'password'
+                print header
+
                 answer = OpenNebulaHelper::OneHelper.get_password
+
+            when 'number', 'number-float'
+                if type == "number"
+                    header += "Integer: "
+                    exp = INT_EXP
+                else
+                    header += "Float: "
+                    exp = FLOAT_EXP
+                end
+
+                begin
+                    print header
+                    answer = STDIN.readline.chop
+
+                    answer = initial if (answer == "")
+
+                    noanswer = ((answer == "") && optional)
+                end while !noanswer && (answer =~ exp) == nil
+
+                if noanswer
+                    next
+                end
+
+            when 'range', 'range-float'
+                min,max = params.split('..')
+
+                if min.nil? || max.nil?
+                    STDERR.puts "Malformed user input. Parameters should be 'min..max':"
+                    STDERR.puts "  #{key}: #{val}"
+                    exit(-1)
+                end
+
+                if type == "range"
+                    exp = INT_EXP
+                    min = min.to_i
+                    max = max.to_i
+
+                    header += "Integer in the range [#{min}..#{max}]: "
+                else
+                    exp = FLOAT_EXP
+                    min = min.to_f
+                    max = max.to_f
+
+                    header += "Float in the range [#{min}..#{max}]: "
+                end
+
+                begin
+                    print header
+                    answer = STDIN.readline.chop
+
+                    answer = initial if (answer == "")
+
+                    noanswer = ((answer == "") && optional)
+                end while !noanswer && ((answer =~ exp) == nil || answer.to_f < min || answer.to_f > max)
+
+                if noanswer
+                    next
+                end
+
+            when 'list'
+                options = params.split(",")
+
+                options.each_with_index {|opt,i|
+                    puts "    #{i}  #{opt}"
+                }
+
+                puts
+
+                header += "Please type the selection number: "
+
+                begin
+                    print header
+                    answer = STDIN.readline.chop
+
+                    if (answer == "")
+                        answer = initial
+                    else
+                        answer = options[answer.to_i]
+                    end
+
+                    noanswer = ((answer == "") && optional)
+
+                end while !noanswer && (!options.include?(answer))
+
+                if noanswer
+                    next
+                end
+
+            when 'fixed'
+                puts "    Fixed value of (#{initial}). Cannot be changed"
+                answer = initial
+
             else
-                STDERR.puts "user input types can only be text or password:"
+                STDERR.puts "Wrong type for user input:"
                 STDERR.puts "  #{key}: #{val}"
                 exit(-1)
             end
-            answers << "#{key} = \""
-            answers << answer.gsub('"', "\\\"") << "\"\n"
+
+            # Do not replace values that are equal to the ones already in the
+            # template. Useful for cpu, mem, vcpu
+            if answer != template['VMTEMPLATE']['TEMPLATE'][key]
+                answers << "#{key} = \""
+                answers << answer.gsub('"', "\\\"") << "\"\n"
+            end
         end
 
         answers

data/lib/one_helper/oneuser_helper.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/one_helper/onevdc_helper.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    #