opennebula-cli 5.7.85.pre → 5.7.90.pre

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 608bcd9d04a44a0a66aafc66cfbc5a301a68c183
-  data.tar.gz: 55407832344ac01ed0d331ce5c47e61667c9d260
+  metadata.gz: 140ee7b9d1fe1f1f0398855476b9725fa3504d83
+  data.tar.gz: f8e03bfed912972e084abcc72d133474b8aedc52
 SHA512:
-  metadata.gz: e27b7f253050290ab01cb292c9d88e5aa1bc1c611bb0637feea8254af643df71c465d57b620bc9ba6828dc334293a4604fb753952497a628d773c94bb71e87ec
-  data.tar.gz: 47be3aceb3b467b79aaa4ed6e89a36e94856597965b7ed08a15f88939515559b7c570f5d4c1b16a69b3ec2b7bcc0d0869450f7966061b2eef084ca7df89d4652
+  metadata.gz: b838c7dbba2a7edc7277630fa870ab72fc9fa140b8e6378cb62afe6c4a1984f95f0679d7560c961216e24b274f6ebb6323c84e79bc5b7862b093055a7467a36e
+  data.tar.gz: c81ef184f9e28f34f1c1e86dfb621edcbfa41d6e2d3044759cdbac5f5c08b38feacd91a202a58a4b453c111da966b10868a8422ef19a3aae0f33c22645b8a251

data/lib/one_helper/onedatastore_helper.rb

@@ -88,8 +88,8 @@ class OneDatastoreHelper < OpenNebulaHelper::OneHelper
             end
 
             column :TYPE, "Datastore type", :left, :size=>4 do |d|
-                type = Datastore::DATASTORE_TYPES[d["TYPE"].to_i]
-                Datastore::SHORT_DATASTORE_TYPES[type]
+                type = OpenNebula::Datastore::DATASTORE_TYPES[d["TYPE"].to_i]
+                OpenNebula::Datastore::SHORT_DATASTORE_TYPES[type]
             end
 
             column :DS, "Datastore driver", :left, :size=>7 do |d|
@@ -101,8 +101,8 @@ class OneDatastoreHelper < OpenNebulaHelper::OneHelper
             end
 
             column :STAT, "State of the Datastore", :left, :size=>3 do |d|
-                state = Datastore::DATASTORE_STATES[d["STATE"].to_i]
-                Datastore::SHORT_DATASTORE_STATES[state]
+                state = OpenNebula::Datastore::DATASTORE_STATES[d["STATE"].to_i]
+                OpenNebula::Datastore::SHORT_DATASTORE_STATES[state]
             end
 
             default :ID, :USER, :GROUP, :NAME, :SIZE, :AVAIL, :CLUSTERS, :IMAGES,

data/lib/one_helper/onehost_helper.rb

@@ -24,7 +24,7 @@ class OneHostHelper < OpenNebulaHelper::OneHelper
     TEMPLATE_XPATH = '//HOST/TEMPLATE'
     HYBRID = {
         :ec2 => {
-            :help => <<-EOT.unindent,
+            :help => <<-EOT.unindent
                 #-----------------------------------------------------------------------
                 # Supported EC2 AUTH ATTRIBUTTES:
                 #
@@ -46,7 +46,7 @@ class OneHostHelper < OpenNebulaHelper::OneHelper
             EOT
         },
         :az => {
-            :help => <<-EOT.unindent,
+            :help => <<-EOT.unindent
                 #-----------------------------------------------------------------------
                 # Supported AZURE AUTH ATTRIBUTTES:
                 #
@@ -212,6 +212,10 @@ class OneHostHelper < OpenNebulaHelper::OneHelper
                 end
             end
 
+            column :PROVIDER, 'Host provider', :left, :size => 6 do |d|
+                d['TEMPLATE']['PM_MAD'].nil? ? '-' : d['TEMPLATE']['PM_MAD']
+            end
+
             column :STAT, 'Host status', :left, :size => 6 do |d|
                 OneHostHelper.state_to_str(d['STATE'])
             end

data/lib/one_helper/oneprovision_helper.rb

@@ -0,0 +1,258 @@
+# -------------------------------------------------------------------------- #
+# Copyright 2002-2019, 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 'securerandom'
+
+# OneProvision Helper
+class OneProvisionHelper < OpenNebulaHelper::OneHelper
+
+    def self.rname
+        'PROVISION'
+    end
+
+    def self.conf_file
+        'oneprovision.yaml'
+    end
+
+    def parse_options(options)
+        OneProvision::OneProvisionLogger.get_logger(options)
+        OneProvision::Mode.get_run_mode(options)
+        OneProvision::Options.get_run_options(options)
+    end
+
+    def format_pool
+        config_file = self.class.table_conf
+
+        table = CLIHelper::ShowTable.new(config_file, self) do
+            column :ID, 'Identifier for the Provision', :size => 36 do |p|
+                p['ID']
+            end
+
+            column :NAME, 'Name of the Provision', :left, :size => 25 do |p|
+                p['NAME']
+            end
+
+            column :CLUSTERS, 'Number of Clusters', :size => 8 do |p|
+                p['CLUSTERS']['ID'].size
+            end
+
+            column :HOSTS, 'Number of Hosts', :size => 5 do |p|
+                p['HOSTS']['ID'].size
+            end
+
+            column :VNETS, 'Number of Networks', :size => 5 do |p|
+                p['VNETS']['ID'].size
+            end
+
+            column :DATASTORES, 'Number of Datastores', :size => 10 do |p|
+                p['DATASTORES']['ID'].size
+            end
+
+            column :STAT, 'Status of the Provision', :left, :size => 15 do |p|
+                p['STATUS']
+            end
+
+            default :ID, :NAME, :CLUSTERS, :HOSTS, :VNETS, :DATASTORES, :STAT
+        end
+
+        table
+    end
+
+    #######################################################################
+    # Helper provision functions
+    #######################################################################
+
+    def create(config)
+        msg = 'OpenNebula is not running'
+
+        OneProvision::Utils.fail(msg) if OneProvision::Utils.one_running?
+
+        provision = OneProvision::Provision.new(SecureRandom.uuid)
+
+        provision.create(config)
+    end
+
+    def configure(provision_id, options)
+        provision = OneProvision::Provision.new(provision_id)
+
+        provision.refresh
+
+        provision.configure((options.key? :force))
+    end
+
+    def delete(provision_id)
+        provision = OneProvision::Provision.new(provision_id)
+
+        provision.refresh
+
+        provision.delete
+    end
+
+    #######################################################################
+    # Helper host functions
+    #######################################################################
+
+    def hosts_operation(hosts, operation, options)
+        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))
+            end
+        end
+    end
+
+    #######################################################################
+    # Utils functions
+    #######################################################################
+
+    def provision_ids
+        clusters = OneProvision::Cluster.new.pool
+        rc = clusters.info
+
+        if OpenNebula.is_error?(rc)
+            OneProvision::Utils.fail(rc.message)
+        end
+
+        clusters = clusters.reject do |x|
+            x['TEMPLATE/PROVISION/PROVISION_ID'].nil?
+        end
+
+        clusters = clusters.uniq do |x|
+            x['TEMPLATE/PROVISION/PROVISION_ID']
+        end
+
+        ids = []
+
+        clusters.each {|c| ids << c['TEMPLATE/PROVISION/PROVISION_ID'] }
+
+        ids
+    end
+
+    def get_list(columns, provision_list)
+        ret = []
+        ids = provision_ids
+
+        ids.each do |i|
+            provision = OneProvision::Provision.new(i)
+            provision.refresh
+
+            element = {}
+
+            element['ID'] = i if provision_list
+            element['ID'] = provision.clusters[0]['ID'] unless provision_list
+
+            element['NAME'] = provision.name
+            element['STATUS'] = provision.status
+
+            columns.each do |c|
+                element[c.to_s.upcase] = { 'ID' => [] }
+
+                provision.instance_variable_get("@#{c}").each do |v|
+                    element[c.to_s.upcase]['ID'] << v['ID']
+                end
+            end
+
+            ret << element
+        end
+
+        ret
+    end
+
+    def list(options)
+        columns = %w[clusters hosts vnets datastores]
+
+        format_pool.show(get_list(columns, true), options)
+
+        0
+    end
+
+    def show(provision_id)
+        provision = OneProvision::Provision.new(provision_id)
+
+        provision.refresh
+
+        OneProvision::Utils.fail('Provision not found.') unless provision.exists
+
+        ret = {}
+        ret['id'] = provision_id
+        ret['name'] = provision.name
+        ret['status'] = provision.status
+
+        %w[clusters datastores hosts vnets].each do |r|
+            ret["@#{r}_ids"] = []
+
+            provision.instance_variable_get("@#{r}").each do |x|
+                ret["@#{r}_ids"] << (x['ID'])
+            end
+        end
+
+        format_resource(ret)
+
+        0
+    end
+
+    def format_resource(provision)
+        str_h1 = '%-80s'
+        status = provision['status']
+        id     = provision['id']
+
+        CLIHelper.print_header(str_h1 % "PROVISION #{id} INFORMATION")
+        puts format('ID      : %<s>s', :s => id)
+        puts format('NAME    : %<s>s', :s => provision['name'])
+        puts format('STATUS  : %<s>s', :s => CLIHelper.color_state(status))
+
+        puts
+        CLIHelper.print_header(format('%<s>s', :s => 'CLUSTERS'))
+        provision['@clusters_ids'].each do |i|
+            puts format('%<s>s', :s => i)
+        end
+
+        puts
+        CLIHelper.print_header(format('%<s>s', :s => 'HOSTS'))
+        provision['@hosts_ids'].each do |i|
+            puts format('%<s>s', :s => i)
+        end
+
+        puts
+        CLIHelper.print_header(format('%<s>s', :s => 'VNETS'))
+        provision['@vnets_ids'].each do |i|
+            puts format('%<s>s', :s => i)
+        end
+
+        puts
+        CLIHelper.print_header(format('%<s>s', :s => 'DATASTORES'))
+        provision['@datastores_ids'].each do |i|
+            puts format('%<s>s', :s => i)
+        end
+    end
+
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: opennebula-cli
 version: !ruby/object:Gem::Version
-  version: 5.7.85.pre
+  version: 5.7.90.pre
 platform: ruby
 authors:
 - OpenNebula
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-02-05 00:00:00.000000000 Z
+date: 2019-02-12 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.85.pre
+        version: 5.7.90.pre
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 5.7.85.pre
+        version: 5.7.90.pre
 description: Commands used to talk to OpenNebula
 email: contact@opennebula.org
 executables:
@@ -88,6 +88,7 @@ files:
 - lib/one_helper/oneimage_helper.rb
 - lib/one_helper/onemarket_helper.rb
 - lib/one_helper/onemarketapp_helper.rb
+- lib/one_helper/oneprovision_helper.rb
 - lib/one_helper/onequota_helper.rb
 - lib/one_helper/onesecgroup_helper.rb
 - lib/one_helper/onetemplate_helper.rb