opennebula-cli 4.8.0 → 4.9.80.beta

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bbd995e66e10d552bf657f6b740611ca27bd7a59
-  data.tar.gz: 4627696981ec98c2f7e58c3f6b757ebccc361fd7
+  metadata.gz: 751cd526db8f21c281fd935cef7f1be0b5aec0ce
+  data.tar.gz: ec2aa2b08bb3f73ad0ee15262a4ac3e51d9727d8
 SHA512:
-  metadata.gz: 0c6a6a1137b7dcba177260cf1837e3431d8494feb118ed1eb16428a272bfd8cde407fa01943c3ff67b0831d107ac516b8084e80f11d218aabf1590465c35dc96
-  data.tar.gz: 7f592fbda949b2e429d06d72612abb7f1b2a801067b7859841dc162b2c5168b53f770501c96e749acf2e1c41029e293974e38389e1fa0eafcd89f9dc157a1ca5
+  metadata.gz: acb5b7a32bb0a16c1acc42844a4e14c57a54ef518caa0d6d1e25c55cd70dfffa5dd14d8cc0b45aeb685ff85a168527a70bb2cbdc0efe6aee48d19e3183ae4d91
+  data.tar.gz: 0ceb58e0181f649b89f6c858a1da819e214699b94b9cccbc201ee834196525d59409baccb4f612cc9aaf4c7162be31f8901c439ccf8068d3d1fa84bf70c5d861

data/NOTICE

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

data/bin/oneuser

@@ -121,7 +121,10 @@ cmd=CommandParser::CmdParser.new(ARGV) do
         :name  => "time",
         :large => "--time x",
         :format => Integer,
-        :description => "Token duration in seconds, defaults to 3600 (1 h)"
+        :description => "Token duration in seconds, defaults to 36000 (10 h). "\
+                        "To reset the token set time to 0." \
+                        "To generate a non-expiring token use -1"\
+                        " (not valid for ssh and x509 tokens). "\
     }
 
     DRIVER={
@@ -131,8 +134,14 @@ cmd=CommandParser::CmdParser.new(ARGV) do
         :description => "Driver to autehnticate this user"
     }
 
+    FORCE = {
+        :name   => "force",
+        :large  => "--force" ,
+        :description => "Force one_auth file rewrite"
+    }
+
     create_options = [READ_FILE, SHA1, SSH, X509, KEY, CERT, DRIVER]
-    login_options  = [SSH, X509, X509_PROXY, KEY, CERT, PROXY, TIME]
+    login_options  = [SSH, X509, X509_PROXY, KEY, CERT, PROXY, TIME, FORCE]
 
     ########################################################################
     # Formatters for arguments
@@ -206,7 +215,7 @@ cmd=CommandParser::CmdParser.new(ARGV) do
     end
 
     quota_desc = <<-EOT.unindent
-        Set the quota limits for the user. If a path is not provided the editor 
+        Set the quota limits for the user. If a path is not provided the editor
         will be launched to modify the current quotas.
     EOT
 
@@ -311,17 +320,31 @@ cmd=CommandParser::CmdParser.new(ARGV) do
     end
 
     login_desc = <<-EOT.unindent
-        Creates the Login token for authentication
-        Examples:
+        Creates the login token for authentication. The token can be used
+        together with any authentication driver. The token will be stored in
+        $HOME/.one/one_auth, and can be used subsequently to authenticate with
+        oned through API, CLI or Sunstone.
+
+        Example, request a valid token for a generic driver (e.g. core auth, LDAP...):
+          oneuser login my_user --time 3600
+
+        Example, generate and set a token for SSH based authentication:
           oneuser login my_user --ssh --key /tmp/id_rsa --time 72000
+
+        Example, same using X509 certificates:
           oneuser login my_user --x509 --cert /tmp/my_cert.pem
                                 --key /tmp/my_key.pk --time 72000
+
+        Example, now with a X509 proxy certificate
           oneuser login my_user --x509_proxy --proxy /tmp/my_cert.pem
                                 --time 72000
     EOT
 
     command :login, login_desc, :username, :options=>login_options do
-        OneUserHelper.login(args[0], options)
+
+        options[:time] ||= 36000
+
+        helper.login(args[0], options)
     end
 
     key_desc = <<-EOT.unindent

data/bin/onevcenter

@@ -0,0 +1,217 @@
+#!/usr/bin/env ruby
+
+# -------------------------------------------------------------------------- #
+# Copyright 2002-2014, OpenNebula Project (OpenNebula.org), C12G Labs        #
+#                                                                            #
+# 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"
+    REMOTES_LOCATION="/var/lib/one/remotes/"
+else
+    RUBY_LIB_LOCATION=ONE_LOCATION+"/lib/ruby"
+    REMOTES_LOCATION=ONE_LOCATION+"/var/remotes/"
+end
+
+$: << RUBY_LIB_LOCATION
+$: << RUBY_LIB_LOCATION+"/cli"
+$: << REMOTES_LOCATION+"vmm/vcenter/"
+
+require 'command_parser'
+require 'one_helper/onehost_helper'
+require 'one_helper/onecluster_helper'
+require 'vcenter_driver'
+
+cmd=CommandParser::CmdParser.new(ARGV) do
+
+    usage "`onevcenter` <command> [<args>] [<options>]"
+    version OpenNebulaHelper::ONE_VERSION
+
+    helper = OneHostHelper.new
+
+    before_proc do
+        helper.set_client(options)
+    end
+
+    ########################################################################
+    # Global Options
+    ########################################################################
+    cmd_options=CommandParser::OPTIONS-[CommandParser::VERBOSE]
+    set :option, cmd_options+OpenNebulaHelper::CLIENT_OPTIONS
+
+
+    VCENTER = {
+        :name   => "vcenter",
+        :large  => "--vcenter vCenter" ,
+        :description => "The vCenter hostname",
+        :format => String
+    }
+
+    USER = {
+        :name   => "vuser",
+        :large  => "--vuser username" ,
+        :description => "The username to interact with vCenter",
+        :format => String
+    }
+
+    PASS = {
+        :name   => "vpass",
+        :large  => "--vpass password",
+        :description => "The password for the user",
+        :format => String
+    }
+
+    ############################################################################
+    # Import clusters
+    ############################################################################
+    hosts_desc = <<-EOT.unindent
+        Import vCenter clusters as OpenNebula hosts
+    EOT
+
+    command :hosts, hosts_desc, :options=>[ VCENTER, USER, PASS ] do
+        if  options[:vuser].nil? ||
+            options[:vpass].nil? ||
+            options[:vcenter].nil?
+            STDERR.puts "vCenter connection parameters are mandatory to import"\
+                        " host:\n"\
+                        "\t --vcenter vCenter hostname\n"\
+                        "\t --vuser username to login in vcenter\n"\
+                        "\t --vpass password for the user"
+            exit -1
+        end
+
+        begin
+            STDOUT.print "\nConnecting to vCenter: #{options[:vcenter]}..."
+
+            vc = VCenterDriver::VIClient.new_connection(
+                    :user     => options[:vuser],
+                    :password => options[:vpass],
+                    :host     => options[:vcenter])
+
+            STDOUT.print "done!\n\n"
+
+            STDOUT.print "Exploring vCenter resources..."
+
+            rs = vc.hierarchy
+
+            STDOUT.print "done!\n\n"
+
+            rs.each {|dc, cluster|
+                STDOUT.print "Do you want to process datacenter #{dc} [y/n]? "
+
+                next if STDIN.gets.strip.downcase != 'y'
+
+                if cluster.empty?
+                    STDOUT.puts "    No clusters found in #{dc}..."
+                    next
+                end
+
+                cluster.each{ |c|
+                    STDOUT.print "  * Import cluster #{c} [y/n]? "
+
+                    next if STDIN.gets.strip.downcase != 'y'
+
+                    r, m = VCenterDriver::VCenterHost.to_one(c, vc)
+
+                    if r == 0
+                        STDOUT.puts "    OpenNebula host #{c} with id #{m}"\
+                            " successfully created."
+                    else
+                        STDOUT.puts "    Error: #{m}"
+                    end
+
+                    STDOUT.puts
+                }
+            }
+        rescue Exception => e
+            STDOUT.puts "error: #{e.message}"
+            exit -1
+        end
+
+        exit 0
+    end
+
+    templates_desc = <<-EOT.unindent
+        Import vCenter VM Templates into OpenNebula
+    EOT
+
+    command :templates, templates_desc, :options=>[ VCENTER, USER, PASS ] do
+        if  options[:vuser].nil? ||
+            options[:vpass].nil? ||
+            options[:vcenter].nil?
+            STDERR.puts "vCenter connection parameters are mandatory to import"\
+                        " VM templates:\n"\
+                        "\t --vcenter vCenter hostname\n"\
+                        "\t --vuser username to login in vcenter\n"\
+                        "\t --vpass password for the user"
+            exit -1
+        end
+
+        begin
+            STDOUT.print "\nConnecting to vCenter: #{options[:vcenter]}..."
+
+            vc = VCenterDriver::VIClient.new_connection(
+                    :user     => options[:vuser],
+                    :password => options[:vpass],
+                    :host     => options[:vcenter])
+
+            STDOUT.print "done!\n\n"
+
+            STDOUT.print "Looking for VM Templates..."
+
+            rs = vc.vm_templates
+
+            STDOUT.print "done!\n"
+
+            rs.each {|dc, tmps|
+                STDOUT.print "\nDo you want to process datacenter #{dc} [y/n]? "
+
+                next if STDIN.gets.strip.downcase != 'y'
+
+                if tmps.empty?
+                    STDOUT.print "    No VM Templates found in #{dc}...\n\n"
+                    next
+                end
+
+                tmps.each{ |t|
+                    STDOUT.print "\n  * VM Template found:\n"\
+                                 "      - Name   : #{t[:name]}\n"\
+                                 "      - UUID   : #{t[:uuid]}\n"\
+                                 "      - Cluster: #{t[:host]}\n"\
+                                 "    Import this VM template [y/n]? "
+
+                    next if STDIN.gets.strip.downcase != 'y'
+
+                    one_t = ::OpenNebula::Template.new(
+                                ::OpenNebula::Template.build_xml, vc.one)
+
+                    rc = one_t.allocate(t[:one])
+
+                    if ::OpenNebula.is_error?(rc)
+                        STDOUT.puts "    Error creating template: #{rc.message}\n"
+                    else
+                        STDOUT.puts "    OpenNebula template #{one_t.id} created!\n"
+                    end
+                }
+            }
+        rescue Exception => e
+            STDOUT.puts "error: #{e.message}"
+            exit -1
+        end
+
+        exit 0
+    end
+end

data/bin/onevnet

@@ -112,9 +112,8 @@ cmd=CommandParser::CmdParser.new(ARGV) do
         Adds an address range to the Virtual Network
     EOT
 
-    command :addar, addar_desc, :vnetid, :options=>STD_OPTIONS + [OneVNetHelper::SIZE,
-        OneVNetHelper::MAC, OneVNetHelper::IP, OneVNetHelper::IP6_GLOBAL,
-        OneVNetHelper::IP6_ULA ] do
+    command :addar, addar_desc, :vnetid,
+            :options => STD_OPTIONS + OneVNetHelper::ADDAR_OPTIONS do
         helper.perform_action(args[0],options,"lease added") do |vn|
             ar = "AR = [ "
 
@@ -143,6 +142,10 @@ cmd=CommandParser::CmdParser.new(ARGV) do
             ar << ", MAC = " << options[:mac] if options[:mac]
             ar << ", GLOBAL_PREFIX = " << options[:ip6_global] if options[:ip6_global]
             ar << ", ULA_PREFIX = " << options[:ip6_ula] if options[:ip6_ula]
+            ar << ", GATEWAY = " << options[:gateway] if options[:gateway]
+            ar << ", MASK = " << options[:netmask] if options[:netmask]
+            ar << ", VLAN = YES" if options[:vlan]
+            ar << ", VLAN_ID = " << options[:vlanid] if options[:vlanid]
 
             ar << "]"
 

data/lib/command_parser.rb

@@ -15,6 +15,7 @@
 #--------------------------------------------------------------------------- #
 
 require 'optparse'
+require 'optparse/time'
 require 'pp'
 
 class String
@@ -28,6 +29,17 @@ class String
     end
 end
 
+if RUBY_VERSION > '1.8.7'
+    OptionParser.accept(Time) do |s,|
+        begin
+            (Time.strptime(s, "%m/%d/%Y %H:%M:%S")) if s
+        rescue
+            raise OptionParser::InvalidArgument, s
+        end
+    end
+end
+
+
 module CommandParser
     OPTIONS = [
         VERBOSE={

data/lib/one_helper/oneacct_helper.rb

@@ -15,7 +15,6 @@
 #--------------------------------------------------------------------------- #
 
 require 'one_helper'
-require 'optparse/time'
 
 class AcctHelper < OpenNebulaHelper::OneHelper
     START_TIME = {

data/lib/one_helper/oneuser_helper.rb

@@ -17,7 +17,17 @@
 require 'one_helper'
 require 'one_helper/onequota_helper'
 
+# Interface for OpenNebula generated tokens.
+class TokenAuth
+    def login_token(username, expire)
+        return OpenNebulaHelper::OneHelper.get_password
+    end
+end
+
 class OneUserHelper < OpenNebulaHelper::OneHelper
+
+    ONE_AUTH     = ENV['HOME']+'/.one/one_auth'
+
     def self.rname
         "USER"
     end
@@ -90,7 +100,14 @@ class OneUserHelper < OpenNebulaHelper::OneHelper
         return 0, auth.password
     end
 
-    def self.login(username, options)
+    ############################################################################
+    # Generates a token and stores it in ONE_AUTH path as defined in this class
+    ############################################################################
+    def login(username, options)
+
+        #-----------------------------------------------------------------------
+        # Init the associated Authentication class to generate the token.
+        #-----------------------------------------------------------------------
         case options[:driver]
         when OpenNebula::User::SSH_AUTH
             require 'opennebula/ssh_auth'
@@ -102,6 +119,7 @@ class OneUserHelper < OpenNebulaHelper::OneHelper
             rescue Exception => e
                 return -1, e.message
             end
+
         when OpenNebula::User::X509_AUTH
             require 'opennebula/x509_auth'
 
@@ -116,6 +134,7 @@ class OneUserHelper < OpenNebulaHelper::OneHelper
             rescue Exception => e
                 return -1, e.message
             end
+
         when OpenNebula::User::X509_PROXY_AUTH
             require 'opennebula/x509_auth'
 
@@ -134,15 +153,47 @@ class OneUserHelper < OpenNebulaHelper::OneHelper
             rescue => e
                 return -1, e.message
             end
+
         else
-            return -1, "You have to specify an Auth method"
+            auth = TokenAuth.new() #oned generated token
         end
 
-        options[:time] ||= 3600
+        #-----------------------------------------------------------------------
+        # Authenticate with oned using the token/passwd and set/generate the
+        # authentication token for the user
+        #-----------------------------------------------------------------------
+        token        = auth.login_token(username, options[:time])
+        login_client = OpenNebula::Client.new("#{username}:#{token}")
 
-        auth.login(username, options[:time])
+        user = OpenNebula::User.new(User.build_xml, login_client)
 
-        return 0, 'export ONE_AUTH=' << auth.class::LOGIN_PATH
+        token_oned = user.login(username, token, options[:time])
+
+        return -1, token_oned.message if OpenNebula.is_error?(token_oned)
+
+        #-----------------------------------------------------------------------
+        # Check that ONE_AUTH target can be written
+        #-----------------------------------------------------------------------
+        if File.file?(ONE_AUTH) && !options[:force]
+                return 0, "File #{ONE_AUTH} exists, use --force to overwrite."\
+                "\nAuthentication Token is:\n#{username}:#{token_oned}"
+        end
+
+        #-----------------------------------------------------------------------
+        # Store the token in ONE_AUTH.
+        #-----------------------------------------------------------------------
+        begin
+            FileUtils.mkdir_p(File.dirname(ONE_AUTH))
+        rescue Errno::EEXIST
+        end
+
+        file = File.open(ONE_AUTH, "w")
+        file.write("#{username}:#{token_oned}")
+        file.close
+
+        File.chmod(0600, ONE_AUTH)
+
+        return 0, ''
     end
 
     def format_pool(options)
@@ -299,6 +350,20 @@ class OneUserHelper < OpenNebulaHelper::OneHelper
         puts str % ["PASSWORD",    user['PASSWORD']]
         puts str % ["AUTH_DRIVER", user['AUTH_DRIVER']]
 
+        if !user['LOGIN_TOKEN/TOKEN'].nil?
+            puts str % ["LOGIN_TOKEN", user['LOGIN_TOKEN/TOKEN']]
+
+            etime = user['LOGIN_TOKEN/EXPIRATION_TIME']
+
+            validity_str = case etime
+                when nil  then ""
+                when "-1" then "forever"
+                else "not after #{Time.at(etime.to_i)}"
+            end
+
+            puts str % ["TOKEN VALIDITY", validity_str ]
+        end
+
         puts str % ["ENABLED",
             OpenNebulaHelper.boolean_to_str(user['ENABLED'])]
 

data/lib/one_helper/onevm_helper.rb

@@ -15,7 +15,6 @@
 #--------------------------------------------------------------------------- #
 
 require 'one_helper'
-require 'optparse/time'
 
 class OneVMHelper < OpenNebulaHelper::OneHelper
     MULTIPLE={
@@ -404,11 +403,41 @@ class OneVMHelper < OpenNebulaHelper::OneHelper
             end if !options[:all]
         end
 
-        if vm.has_elements?("/VM/TEMPLATE/NIC")
+        if vm.has_elements?("/VM/USER_TEMPLATE/HYPERVISOR")
+            vm_information = vm.to_hash['VM']
+            hybridvisor    = vm_information['USER_TEMPLATE']['HYPERVISOR'].to_s
+            isHybrid       = %w{vcenter ec2 azure softlayer}.include? hybridvisor
+
+            if isHybrid
+                vm_tmplt = vm_information['TEMPLATE']
+                nic =   {"NETWORK" => "-",
+                           "IP" => "-",
+                           "MAC"=> "-",
+                           "VLAN"=>"no",
+                           "BRIDGE"=>"-"}
+
+                case hybridvisor
+                    when "vcenter"
+                        nic.IP = vm_tmplt['GUEST_IP'] if vm_tmplt['GUEST_IP']
+                    when "ec2"
+                        nic.IP = vm_tmplt['IP_ADDRESS'] if vm_tmplt['IP_ADDRESS']
+                    when "azure"
+                        nic.IP = vm_tmplt['IPADDRESS'] if vm_tmplt['IPADDRESS']
+                    when "softlayer"
+                        nic.IP = vm_tmplt['PRIMARYIPADDRESS'] if vm_tmplt['PRIMARYIPADDRESS']
+                    else
+                        isHybrid = false
+                end
+
+                vm_nics = [nic]
+            end
+        end
+
+        if vm.has_elements?("/VM/TEMPLATE/NIC") || vm_nics
             puts
             CLIHelper.print_header(str_h1 % "VM NICS",false)
 
-            vm_nics = [vm.to_hash['VM']['TEMPLATE']['NIC']].flatten
+            vm_nics = [vm.to_hash['VM']['TEMPLATE']['NIC']].flatten if !vm_nics
 
             nic_default = {"NETWORK" => "-",
                            "IP" => "-",

data/lib/one_helper/onevnet_helper.rb

@@ -82,6 +82,36 @@ class OneVNetHelper < OpenNebulaHelper::OneHelper
 #        :description => "Number of addresses to reserve"
 #    }
 
+    GATEWAY = [
+        :name       => "gateway",
+        :large      => "--gateway ip",
+        :format     => String,
+        :description=> "IP of the gateway"
+    ]
+
+    NETMASK = [
+        :name       => "netmask",
+        :large      => "--netmask mask",
+        :format     => String,
+        :description=> "Netmask in dot notation"
+    ]
+
+    VLAN = [
+        :name       => "vlan",
+        :large      => "--vlan",
+        :description=> "Use network isolation"
+    ]
+
+    VLAN_ID = [
+        :name       => "vlanid",
+        :large      => "--vlanid id",
+        :format     => String,
+        :description=> "VLAN ID assigned"
+    ]
+
+    ADDAR_OPTIONS = [
+        SIZE, MAC, IP, IP6_GLOBAL, IP6_ULA, GATEWAY, NETMASK, VLAN, VLAN_ID ]
+
     def self.rname
         "VNET"
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: opennebula-cli
 version: !ruby/object:Gem::Version
-  version: 4.8.0
+  version: 4.9.80.beta
 platform: ruby
 authors:
 - OpenNebula
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-31 00:00:00.000000000 Z
+date: 2014-10-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: opennebula
@@ -16,34 +16,37 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.8.0
+        version: 4.9.80.beta
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.8.0
+        version: 4.9.80.beta
 description: Commands used to talk to OpenNebula
 email: contact@opennebula.org
 executables:
-- oneacct
 - oneacl
-- onecluster
-- onedatastore
-- oneflow
-- oneflow-template
-- onegroup
 - onehost
+- oneflow-template
+- onevnet
 - oneimage
+- onevcenter
+- onedatastore
+- onevm
+- onegroup
+- onecluster
 - onetemplate
+- oneflow
 - oneuser
-- onevm
-- onevnet
 - onezone
+- oneacct
 extensions: []
 extra_rdoc_files: []
 files:
+- LICENSE
+- NOTICE
 - bin/oneacct
 - bin/oneacl
 - bin/onecluster
@@ -55,6 +58,7 @@ files:
 - bin/oneimage
 - bin/onetemplate
 - bin/oneuser
+- bin/onevcenter
 - bin/onevm
 - bin/onevnet
 - bin/onezone
@@ -74,8 +78,6 @@ files:
 - lib/one_helper/onevm_helper.rb
 - lib/one_helper/onevnet_helper.rb
 - lib/one_helper/onezone_helper.rb
-- NOTICE
-- LICENSE
 homepage: http://opennebula.org
 licenses: []
 metadata: {}
@@ -85,17 +87,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.14
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: OpenNebula Command Line Interface