opennebula-cli 4.14.2 → 4.90.0.beta1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8c8b0d34aa27f09011a52b0ac589242fdbc8c497
-  data.tar.gz: e798b9a08d35fa05ebf9637a35fa0ccfff817be2
+  metadata.gz: 03d316a86c2d34e3a0f246b8c1bc65380a3edabb
+  data.tar.gz: 9cce74d38345ea1f873119f10bdb16ace40391a6
 SHA512:
-  metadata.gz: 38bf76e873ef7b2722e4bbcaaa5cca317a14010aac0f1eba7345c3cc2d644a80377d419b5d45ba9adce8c4b70520551c63339d62dd6c8dcb001a4625c2c8486b
-  data.tar.gz: 9983b5712e6a5c975b32b4b9e8db3a68c30699afa6336e4b191c7f3a2289ce1181cc181ad317c47a4f41ddce2c627c4730aea0f4192f214683c9f91675b7f612
+  metadata.gz: adc9b92034a6fb1ac7d4ee40ed90ae967eed40a05e34309ab02cd21a383cbb9112e58b0bad114d3e3b6e48cb4c22d2606c7b1974b306340cc2044352b78226d3
+  data.tar.gz: 5651dbf53d3b2827bb65bd839c3c58b9a401e013864e7eab4183902240937126ef4c260a17f2669b285735075b0b8b8340e387a5fc959d46aedfd6aba9c594d7

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/bin/oneacct

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 
 # -------------------------------------------------------------------------- #
-# 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/bin/oneacl

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 
 # -------------------------------------------------------------------------- #
-# 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/bin/onecluster

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 
 # -------------------------------------------------------------------------- #
-# 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    #
@@ -194,6 +194,9 @@ cmd=CommandParser::CmdParser.new(ARGV) do
                 str = OpenNebulaHelper.update_template(args[0], obj, args[1])
             end
 
+            helper.set_client(options)
+            obj = helper.retrieve_resource(obj.id)
+
             obj.update(str, options[:append])
         end
     end

data/bin/onedatastore

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 
 # -------------------------------------------------------------------------- #
-# 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    #
@@ -171,6 +171,9 @@ cmd=CommandParser::CmdParser.new(ARGV) do
                 str = OpenNebulaHelper.update_template(args[0], obj, args[1])
             end
 
+            helper.set_client(options)
+            obj = helper.retrieve_resource(obj.id)
+
             obj.update(str, options[:append])
         end
     end

data/bin/oneflow

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 
 # -------------------------------------------------------------------------- #
-# 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    #
@@ -650,6 +650,31 @@ cmd=CommandParser::CmdParser.new(ARGV) do
         }
     end
 
+    rename_desc = <<-EOT.unindent
+        Renames the Service 
+    EOT
+
+    command :rename, rename_desc, :service_id, :name do
+        client = Service::Client.new(
+                    :username   => options[:username],
+                    :password   => options[:password],
+                    :url        => options[:server],
+                    :user_agent => USER_AGENT)
+
+        params = Hash.new
+        params['name'] = args[1]
+
+        json_action = Service.build_json_action('rename', params)
+
+        response = client.post("#{RESOURCE_PATH}/#{args[0]}/action", json_action)
+
+        if CloudClient::is_error?(response)
+            [response.code.to_i, response.to_s]
+        else
+            response.code.to_i
+        end
+    end
+
     action_desc = <<-EOT.unindent
         Perform an action on all the Virtual Machines of a given role.
         Actions supported: #{Role::SCHEDULE_ACTIONS.join(",")}

data/bin/oneflow-template

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 
 # -------------------------------------------------------------------------- #
-# 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    #
@@ -399,6 +399,62 @@ cmd=CommandParser::CmdParser.new(ARGV) do
         }
     end
 
+    clone_desc = <<-EOT.unindent
+        Creates a new Service Template from an existing one
+    EOT
+
+    command :clone, clone_desc, :templateid, :name do
+        client = Service::Client.new(
+                    :username   => options[:username],
+                    :password   => options[:password],
+                    :url        => options[:server],
+                    :user_agent => USER_AGENT)
+
+        params = Hash.new
+        params['name'] = args[1]
+
+        json_action = Service.build_json_action('clone', params)
+
+        response = client.post("#{RESOURCE_PATH}/#{args[0]}/action", json_action)
+
+        if CloudClient::is_error?(response)
+            [response.code.to_i, response.to_s]
+        else
+            if options[:json]
+                [0, response.body]
+            else
+                template = JSON.parse(response.body)
+                puts "ID: #{template['DOCUMENT']['ID']}"
+                0
+            end
+        end
+    end
+
+    rename_desc = <<-EOT.unindent
+        Renames the Service Template
+    EOT
+
+    command :rename, rename_desc, :templateid, :name do
+        client = Service::Client.new(
+                    :username   => options[:username],
+                    :password   => options[:password],
+                    :url        => options[:server],
+                    :user_agent => USER_AGENT)
+
+        params = Hash.new
+        params['name'] = args[1]
+
+        json_action = Service.build_json_action('rename', params)
+
+        response = client.post("#{RESOURCE_PATH}/#{args[0]}/action", json_action)
+
+        if CloudClient::is_error?(response)
+            [response.code.to_i, response.to_s]
+        else
+            response.code.to_i
+        end
+    end
+
     update_desc = <<-EOT.unindent
         Update the template contents. If a path is not provided the editor will
         be launched to modify the current content.

data/bin/onegroup

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 
 # -------------------------------------------------------------------------- #
-# 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    #
@@ -130,6 +130,9 @@ cmd=CommandParser::CmdParser.new(ARGV) do
                 str = OpenNebulaHelper.update_template(args[0], obj, args[1])
             end
 
+            helper.set_client(options)
+            obj = helper.retrieve_resource(obj.id)
+
             obj.update(str, options[:append])
         end
     end

data/bin/onehost

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 
 # -------------------------------------------------------------------------- #
-# 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    #
@@ -65,14 +65,6 @@ cmd=CommandParser::CmdParser.new(ARGV) do
     :format => String
     }
 
-    VNET = {
-    :name   => "net",
-    :short  => "-n vnet_mad",
-    :large  => "--net vnet_mad" ,
-    :description => "Set the network driver for the host",
-    :format => String
-    }
-
     FORCE = {
         :name   => "force",
         :large  => "--force" ,
@@ -87,7 +79,7 @@ cmd=CommandParser::CmdParser.new(ARGV) do
             " rsync command must be installed in the frontend and nodes."
     }
 
-    CREAT_OPTIONS = [ IM, VMM, VNET, OneClusterHelper::CLUSTER ]
+    CREAT_OPTIONS = [ IM, VMM, OneClusterHelper::CLUSTER ]
     SYNC_OPTIONS  = [ OneClusterHelper::CLUSTER, FORCE, RSYNC ]
 
     ########################################################################
@@ -111,11 +103,10 @@ cmd=CommandParser::CmdParser.new(ARGV) do
     EOT
 
     command :create, create_desc, :hostname, :options=>CREAT_OPTIONS do
-        if options[:im].nil? or options[:vm].nil? or options[:net].nil?
+        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 -n network driver"
             exit -1
         end
 
@@ -125,7 +116,6 @@ cmd=CommandParser::CmdParser.new(ARGV) do
                 host.allocate(args[0],
                               options[:im],
                               options[:vm],
-                              options[:net],
                               cid)
         end
     end
@@ -141,7 +131,7 @@ cmd=CommandParser::CmdParser.new(ARGV) do
     end
 
     enable_desc = <<-EOT.unindent
-        Enables the given Host
+        Enables the given host, fully operational
     EOT
 
     command :enable, enable_desc, [:range,:hostid_list] do
@@ -151,7 +141,10 @@ cmd=CommandParser::CmdParser.new(ARGV) do
     end
 
     disable_desc = <<-EOT.unindent
-        Disables the given Host
+        Disables the given host:
+          - monitor: enabled
+          - scheduler deployment: disabled
+          - manual deployment: enabled
     EOT
 
     command :disable, disable_desc, [:range,:hostid_list] do
@@ -160,6 +153,19 @@ cmd=CommandParser::CmdParser.new(ARGV) do
         end
     end
 
+    offline_desc = <<-EOT.unindent
+        Sets the host offline:
+          - monitor: disabled
+          - scheduler deployment: disabled
+          - manual deployment: disabled
+    EOT
+
+    command :offline, offline_desc, [:range,:hostid_list] do
+        helper.perform_actions(args[0],options,"offline") do |host|
+            host.offline
+        end
+    end
+
     update_desc = <<-EOT.unindent
         Update the template contents. If a path is not provided the editor will
         be launched to modify the current content.
@@ -174,6 +180,9 @@ cmd=CommandParser::CmdParser.new(ARGV) do
                 str = OpenNebulaHelper.update_template(args[0], obj, args[1])
             end
 
+            helper.set_client(options)
+            obj = helper.retrieve_resource(obj.id)
+
             obj.update(str, options[:append])
         end
     end

data/bin/oneimage

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 
 # -------------------------------------------------------------------------- #
-# 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    #
@@ -109,8 +109,7 @@ cmd=CommandParser::CmdParser.new(ARGV) do
 
           - a datablock image of 400MB:
 
-            oneimage create -d 1 --name data --type DATABLOCK --size 400 \\
-                            --fstype ext2
+            oneimage create -d 1 --name data --type DATABLOCK --size 400
 
     EOT
 
@@ -223,6 +222,9 @@ cmd=CommandParser::CmdParser.new(ARGV) do
                 str = OpenNebulaHelper.update_template(args[0], obj, args[1])
             end
 
+            helper.set_client(options)
+            obj = helper.retrieve_resource(obj.id)
+
             obj.update(str, options[:append])
         end
     end

data/bin/onemarket

@@ -0,0 +1,178 @@
+#!/usr/bin/env ruby
+
+# -------------------------------------------------------------------------- #
+# 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.                                             #
+#--------------------------------------------------------------------------- #
+
+ONE_LOCATION=ENV["ONE_LOCATION"]
+
+if !ONE_LOCATION
+    RUBY_LIB_LOCATION="/usr/lib/one/ruby"
+else
+    RUBY_LIB_LOCATION=ONE_LOCATION+"/lib/ruby"
+end
+
+$: << RUBY_LIB_LOCATION
+$: << RUBY_LIB_LOCATION+"/cli"
+
+require 'command_parser'
+require 'one_helper/onemarket_helper'
+
+cmd=CommandParser::CmdParser.new(ARGV) do
+    usage "`onemarket` <command> [<args>] [<options>]"
+    version OpenNebulaHelper::ONE_VERSION
+
+    helper = OneMarketPlaceHelper.new
+
+    before_proc do
+        helper.set_client(options)
+    end
+
+    ########################################################################
+    # Global Options
+    ########################################################################
+    set :option, CommandParser::OPTIONS+OpenNebulaHelper::CLIENT_OPTIONS
+
+    list_options = CLIHelper::OPTIONS
+    list_options << OpenNebulaHelper::XML
+    list_options << OpenNebulaHelper::NUMERIC
+    list_options << OpenNebulaHelper::DESCRIBE
+
+    ########################################################################
+    # Formatters for arguments
+    ########################################################################
+    set :format, :marketplaceid, OneMarketPlaceHelper.to_id_desc do |arg|
+        helper.to_id(arg)
+    end
+
+    set :format, :marketplaceid_list, OneMarketPlaceHelper.list_to_id_desc do |arg|
+        helper.list_to_id(arg)
+    end
+
+    set :format, :groupid, OpenNebulaHelper.rname_to_id_desc("GROUP") do |arg|
+        OpenNebulaHelper.rname_to_id(arg, "GROUP")
+    end
+
+    set :format, :userid, OpenNebulaHelper.rname_to_id_desc("USER") do |arg|
+        OpenNebulaHelper.rname_to_id(arg, "USER")
+    end
+
+    ########################################################################
+    # Commands
+    ########################################################################
+
+    create_desc = <<-EOT.unindent
+        Creates a new Marketplace from the given template file
+    EOT
+
+    command :create, create_desc, :file do
+
+        helper.create_resource(options) do |marketplace|
+            begin
+                template = File.read(args[0])
+                marketplace.allocate(template)
+            rescue =>e
+                STDERR.puts e.message
+                exit -1
+            end
+        end
+    end
+
+    delete_desc = <<-EOT.unindent
+        Deletes the given Marketplace
+    EOT
+
+    command :delete, delete_desc, [:range, :marketplaceid_list] do
+        helper.perform_actions(args[0],options,"deleted") do |obj|
+            obj.delete
+        end
+    end
+
+    chgrp_desc = <<-EOT.unindent
+        Changes the Marketplace group
+    EOT
+
+    command :chgrp, chgrp_desc,[:range, :marketplaceid_list], :groupid do
+        helper.perform_actions(args[0],options,"Group changed") do |obj|
+            obj.chown(-1, args[1].to_i)
+        end
+    end
+
+    chown_desc = <<-EOT.unindent
+        Changes the Marketplace owner and group
+    EOT
+
+    command :chown, chown_desc, [:range, :marketplaceid_list], :userid,
+            [:groupid,nil] do
+        gid = args[2].nil? ? -1 : args[2].to_i
+        helper.perform_actions(args[0],options,"Owner/Group changed") do |obj|
+            obj.chown(args[1].to_i, gid)
+        end
+    end
+
+    chmod_desc = <<-EOT.unindent
+        Changes the Marketplace permissions
+    EOT
+
+    command :chmod, chmod_desc, [:range, :marketplaceid_list], :octet do
+        helper.perform_actions(args[0],options, "Permissions changed") do |obj|
+            obj.chmod_octet(args[1])
+        end
+    end
+
+    list_desc = <<-EOT.unindent
+        Lists Marketplaces
+    EOT
+
+    command :list, list_desc, :options=>list_options do
+        helper.list_pool(options)
+    end
+
+    show_desc = <<-EOT.unindent
+        Shows Marketplace information
+    EOT
+
+    command :show, show_desc, :marketplaceid, :options=>OpenNebulaHelper::XML do
+        helper.show_resource(args[0],options)
+    end
+
+    update_desc = <<-EOT.unindent
+        Update the template contents. If a path is not provided the editor will
+        be launched to modify the current content.
+    EOT
+
+    command :update, update_desc, :marketplaceid, [:file, nil],
+    :options=>OpenNebulaHelper::APPEND do
+        helper.perform_action(args[0],options,"modified") do |obj|
+            if options[:append]
+                str = OpenNebulaHelper.append_template(args[0], obj, args[1])
+            else
+                str = OpenNebulaHelper.update_template(args[0], obj, args[1])
+            end
+
+            obj.update(str, options[:append])
+        end
+    end
+
+    rename_desc = <<-EOT.unindent
+        Renames the Marketplace
+    EOT
+
+    command :rename, rename_desc, :marketplaceid, :name do
+        helper.perform_action(args[0],options,"renamed") do |o|
+            o.rename(args[1])
+        end
+    end
+end