opennebula-cli 5.1.80.beta1 → 5.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5918a18eb88bc2dd352bda44bef92b4e1311ff04
-  data.tar.gz: 91eca333217510670bbb7d4746b329421db599a1
+  metadata.gz: bc61f6e7f892feb55e7f937e5118fd75a06dbcf8
+  data.tar.gz: 3848dae4195c901537b34a57ac30848851797379
 SHA512:
-  metadata.gz: e2d80b573fcc114f130fbee620504dbb92cd9dca78b033a7fc9358f383d685baef15cc55620e902c35ea2e956060612db4b608ab3a607a2fed376044f9611984
-  data.tar.gz: 015e5537a21a89848a682ef1be2dcd30266e6abc9f9a764c106af402f42808d302b9344267e336af4feb2ba8d9a7cb942b7b8aa4556cea72e28dee54467ffab0
+  metadata.gz: 56289d0bcaee81b7cb480af29379f8ed79dfbbe66e8746d9826c7d1e65d2c540af0504c37565fbf4eac8f46c8c02fbb190745c99670cac463257a2affcdb3c7f
+  data.tar.gz: 8a4823dec3b60882a02b842d99b76ae401ab8d97db56f28d9422767338c196b92132004f4860357b48354f923ff08c1b0b24b70143580bb6642d07a559552b7b

data/bin/oneuser

@@ -40,7 +40,7 @@ cmd=CommandParser::CmdParser.new(ARGV) do
     helper = OneUserHelper.new
 
     before_proc do
-        helper.set_client(options) if ![:login, :key].include?(@comm_name)
+        helper.set_client(options) if ![:key].include?(@comm_name)
     end
 
     ########################################################################
@@ -131,7 +131,7 @@ cmd=CommandParser::CmdParser.new(ARGV) do
         :name => "driver",
         :large => "--driver driver",
         :format => String,
-        :description => "Driver to autehnticate this user"
+        :description => "Driver to authenticate this user"
     }
 
     FORCE = {
@@ -157,6 +157,28 @@ cmd=CommandParser::CmdParser.new(ARGV) do
         }
     }
 
+    GROUP_CREATE = {
+        :name   => "group",
+        :large  => "--group id|name" ,
+        :description => "Comma-separated list of Groups for the new User. "\
+                        "The first Group will be the main one.",
+        :format => String,
+        :proc   => lambda { |o, options|
+            gids = o.split(",").map { |g|
+                id = OpenNebulaHelper.rname_to_id(g, "GROUP")
+
+                if (id[0] == -1)
+                    puts id[1]
+                    exit -1
+                end
+
+                id[1]
+            }
+
+            [0, gids]
+        }
+    }
+
     GLOBAL = {
         :name   => "global",
         :large  => "--global" ,
@@ -169,7 +191,9 @@ cmd=CommandParser::CmdParser.new(ARGV) do
         :description => "enable stdin password"
     }
 
-    create_options = [READ_FILE, SHA1, SSH, X509, KEY, CERT, DRIVER]
+    auth_options = [READ_FILE, SHA1, SSH, X509, KEY, CERT, DRIVER]
+
+    create_options = auth_options.clone.unshift(GROUP_CREATE)
 
     login_options  = [SSH,
                       X509,
@@ -212,6 +236,7 @@ cmd=CommandParser::CmdParser.new(ARGV) do
         Examples:
           oneuser create my_user my_password
           oneuser create my_user -r /tmp/mypass
+          oneuser create my_user my_password --group users,102,testers
           oneuser create my_user --ssh --key /tmp/id_rsa
           oneuser create my_user --ssh -r /tmp/public_key
           oneuser create my_user --x509 --cert /tmp/my_cert.pem
@@ -232,8 +257,10 @@ cmd=CommandParser::CmdParser.new(ARGV) do
 
         driver = options[:driver] || OpenNebula::User::CORE_AUTH
 
+        gids = options[:group] || []
+
         helper.create_resource(options) do |user|
-            user.allocate(args[0], pass, driver)
+            user.allocate(args[0], pass, driver, gids)
         end
     end
 
@@ -411,7 +438,7 @@ cmd=CommandParser::CmdParser.new(ARGV) do
     EOT
 
     command :passwd, passwd_desc, :userid, [:password, nil],
-            :options=>create_options do
+            :options=>auth_options do
         if args[1]
             pass = args[1]
         else
@@ -474,7 +501,7 @@ cmd=CommandParser::CmdParser.new(ARGV) do
     EOT
 
     command :chauth, chauth_desc, :userid, [:auth, nil], [:password, nil],
-            :options=>create_options do
+            :options=>auth_options do
         if options[:driver]
             driver = options[:driver]
         elsif args[1]

data/lib/one_helper.rb

@@ -661,6 +661,7 @@ EOT
             when "a", "all"   then OpenNebula::Pool::INFO_ALL
             when "m", "mine"  then OpenNebula::Pool::INFO_MINE
             when "g", "group" then OpenNebula::Pool::INFO_GROUP
+            when "G", "primary group" then OpenNebula::Pool::INFO_PRIMARY_GROUP
             else
                 if str.match(/^[0123456789]+$/)
                     str.to_i
@@ -679,12 +680,13 @@ EOT
 
         def self.filterflag_to_i_desc
             desc=<<-EOT
-a, all       all the known #{self.rname}s
-m, mine      the #{self.rname} belonging to the user in ONE_AUTH
-g, group     'mine' plus the #{self.rname} belonging to the groups
-             the user is member of
-uid          #{self.rname} of the user identified by this uid
-user         #{self.rname} of the user identified by the username
+a, all            all the known #{self.rname}s
+m, mine           the #{self.rname} belonging to the user in ONE_AUTH
+g, group          'mine' plus the #{self.rname} belonging to the groups
+                  the user is member of
+G, primary group  the #{self.rname} owned the user's primary group
+uid               #{self.rname} of the user identified by this uid
+user              #{self.rname} of the user identified by the username
 EOT
         end
 

data/lib/one_helper/oneuser_helper.rb

@@ -28,7 +28,11 @@ end
 
 class OneUserHelper < OpenNebulaHelper::OneHelper
 
-    ONE_AUTH = ENV['HOME']+'/.one/one_auth'
+    if ENV['HOME']
+        ONE_AUTH = ENV['HOME']+'/.one/one_auth'
+    else
+        ONE_AUTH = "/var/lib/one/.one/one_auth"
+    end
 
     def self.rname
         "USER"
@@ -443,7 +447,7 @@ class OneUserHelper < OpenNebulaHelper::OneHelper
         rc   = user.info
         if OpenNebula.is_error?(rc)
             puts rc.message
-            exit_with_code 1, rc.message
+            exit 1
         end
         user
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: opennebula-cli
 version: !ruby/object:Gem::Version
-  version: 5.1.80.beta1
+  version: 5.2.0
 platform: ruby
 authors:
 - OpenNebula
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-16 00:00:00.000000000 Z
+date: 2016-10-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: opennebula
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 5.1.80.beta1
+        version: 5.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 5.1.80.beta1
+        version: 5.2.0
 description: Commands used to talk to OpenNebula
 email: contact@opennebula.org
 executables:
@@ -112,9 +112,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.5.1