opennebula-cli 5.7.90.pre → 5.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 140ee7b9d1fe1f1f0398855476b9725fa3504d83
-  data.tar.gz: f8e03bfed912972e084abcc72d133474b8aedc52
+  metadata.gz: fe049a40201dabb3ab6af5af5a94dfe86c3bd260
+  data.tar.gz: 26e453a1dbc3b0501da198b80a481d4fa6c5a99a
 SHA512:
-  metadata.gz: b838c7dbba2a7edc7277630fa870ab72fc9fa140b8e6378cb62afe6c4a1984f95f0679d7560c961216e24b274f6ebb6323c84e79bc5b7862b093055a7467a36e
-  data.tar.gz: c81ef184f9e28f34f1c1e86dfb621edcbfa41d6e2d3044759cdbac5f5c08b38feacd91a202a58a4b453c111da966b10868a8422ef19a3aae0f33c22645b8a251
+  metadata.gz: 910e873ea0a7024ef4eaa70c6247b7c09c2a92c2e1e04b726eea74ab1cf5700e0f522c9c84d576f8d97b7c79d5c859e071d2abac46294b9488dda866fbed1a4d
+  data.tar.gz: bf953b9791f13555de9ee1818f92fb429859c391d510ff1fb614d22dbfc3cbd430c3b2222055770c04441ffd428a49d40eb73bdc9e9a1a19a3bba7ba09dcb2de

data/NOTICE

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

data/lib/one_helper/onehost_helper.rb

@@ -363,8 +363,10 @@ class OneHostHelper < OpenNebulaHelper::OneHelper
                         sync_cmd = "rsync -Laz --delete #{REMOTES_LOCATION}" \
                                    " #{host['NAME']}:#{remote_dir}"
                     else
-                        sync_cmd = "scp -rp #{REMOTES_LOCATION}/. " \
-                                   "#{host['NAME']}:#{remote_dir} 2> /dev/null"
+                        sync_cmd = "ssh #{host['NAME']}" \
+                                   " mkdir -p '#{remote_dir}' 2>/dev/null &&" \
+                                   " scp -rp #{REMOTES_LOCATION}/*" \
+                                   " #{host['NAME']}:#{remote_dir} 2> /dev/null"
                     end
 
                     `#{sync_cmd} 2>/dev/null`

data/lib/one_helper/oneprovision_helper.rb

@@ -85,47 +85,103 @@ class OneProvisionHelper < OpenNebulaHelper::OneHelper
         provision.create(config)
     end
 
-    def configure(provision_id, options)
+    def configure(provision_id, force)
         provision = OneProvision::Provision.new(provision_id)
 
         provision.refresh
 
-        provision.configure((options.key? :force))
+        provision.configure(force)
     end
 
-    def delete(provision_id)
+    def delete(provision_id, cleanup)
         provision = OneProvision::Provision.new(provision_id)
 
         provision.refresh
 
-        provision.delete
+        provision.delete(cleanup)
     end
 
     #######################################################################
     # Helper host functions
     #######################################################################
 
-    def hosts_operation(hosts, operation, options)
+    def host_operation(host, operation, options, args)
+        host = OneProvision::Host.new(host['ID'])
+
+        case operation[:operation]
+        when 'resume'
+            host.resume
+        when 'poweroff'
+            host.poweroff
+        when 'reboot'
+            host.reboot((options.key? :hard))
+        when 'delete'
+            host.delete
+        when 'configure'
+            host.configure((options.key? :force))
+        when 'ssh'
+            host.ssh(args)
+        end
+    end
+
+    #######################################################################
+    # Helper datastore functions
+    #######################################################################
+
+    def datastore_operation(datastore, operation)
+        case operation[:operation]
+        when 'delete'
+            msg = "Deleting datastore #{datastore['ID']}"
+
+            OneProvision::OneProvisionLogger.info(msg)
+
+            datastore.delete
+        end
+    end
+
+    #######################################################################
+    # Helper vnet functions
+    #######################################################################
+
+    def vnet_operation(vnet, operation)
+        case operation[:operation]
+        when 'delete'
+            msg = "Deleting vnet #{vnet['ID']}"
+
+            OneProvision::OneProvisionLogger.info(msg)
+
+            vnet.delete
+        end
+    end
+
+    #######################################################################
+    # Helper resource functions
+    #######################################################################
+
+    def resources_operation(args, operation, options, type)
         parse_options(options)
 
-        host_helper = OneHostHelper.new
-        host_helper.set_client(options)
-        host_helper.perform_actions(hosts,
-                                    options,
-                                    operation[:message]) do |host|
-            host = OneProvision::Host.new(host['ID'])
-
-            case operation[:operation]
-            when 'resume'
-                host.resume
-            when 'poweroff'
-                host.poweroff
-            when 'reboot'
-                host.reboot((options.key? :hard))
-            when 'delete'
-                host.delete
-            when 'configure'
-                host.configure((options.key? :force))
+        helper = nil
+
+        case type
+        when 'HOST'      then helper = OneHostHelper.new
+        when 'DATASTORE' then helper = OneDatastoreHelper.new
+        when 'VNET'      then helper = OneVNetHelper.new
+        end
+
+        objects = names_to_ids(args[0], type)
+
+        helper.set_client(options)
+        helper.perform_actions(objects,
+                               options,
+                               operation[:message]) do |obj|
+            case type
+            when 'HOST'      then host_operation(obj,
+                                                 operation,
+                                                 options,
+                                                 args[1])
+            when 'DATASTORE' then datastore_operation(obj, operation)
+            when 'VNET'      then vnet_operation(obj, operation)
             end
         end
     end
@@ -157,6 +213,14 @@ class OneProvisionHelper < OpenNebulaHelper::OneHelper
         ids
     end
 
+    def names_to_ids(objects, type)
+        objects = [objects].flatten.map do |obj|
+            OpenNebulaHelper.rname_to_id(obj.to_s, type)[1]
+        end
+
+        objects
+    end
+
     def get_list(columns, provision_list)
         ret = []
         ids = provision_ids

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: opennebula-cli
 version: !ruby/object:Gem::Version
-  version: 5.7.90.pre
+  version: 5.8.0
 platform: ruby
 authors:
 - OpenNebula
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-02-12 00:00:00.000000000 Z
+date: 2019-02-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: opennebula
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 5.7.90.pre
+        version: 5.8.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 5.7.90.pre
+        version: 5.8.0
 description: Commands used to talk to OpenNebula
 email: contact@opennebula.org
 executables:
@@ -118,9 +118,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.0.14.1