opennebula-cli 5.13.85.pre → 5.13.90.pre

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 855c80b5cfbc91284d684d4ad8c16b16723280a4
-  data.tar.gz: 583fd805721234146baa37a38cfb231bda65d77d
+  metadata.gz: f6c52bc40b4e949345ed9bac9f2207b555dd156a
+  data.tar.gz: d39c984eec1e4d6ec6ba9879d7559624fbf915b4
 SHA512:
-  metadata.gz: 0e13faf950b3041e3fe6957f9d007b9ed984cf6ecf201e6148b8ca203f18390dfc78cc01c2208881aef764809cc3ad8c073100c3b5498a44681677f46168e9b9
-  data.tar.gz: c42cb386febcc3f7a25bebddc11747bd8d7337f7e3cff466ad8d12fa8fd95e77e905ec307e18981d9bbcd0d605a97809b113819070184377d4d5a2ba06c8ce33
+  metadata.gz: d16858614526757ef2e1c694205362a7620462f0d6e367500c14623149529a2c82e769488f9acdb69d76a6697389d37b11b298d21b78b12a92c468203205560e
+  data.tar.gz: cf91f4ee501d0c3cdad503bedaac907f240ff134c5ab0bc6604c44a35e786e026527a7bceb3af18b4eacef3a15226ed53eeaec7107bca28cb323d7ebd0cd0fb0

data/bin/onevcenter

@@ -239,7 +239,7 @@ CommandParser::CmdParser.new(ARGV) do
                     " this input: #{args.first}"
             end
 
-            importer.process_import(indexes) do |object_info|
+            importer.process_import(indexes, options) do |object_info|
                 helper.cli_dialogue(object_info)
             end
 
@@ -260,10 +260,11 @@ CommandParser::CmdParser.new(ARGV) do
             importer = VCenterDriver::VcImporter.new_child(helper.client,
                                                            vi_client,
                                                            options[:object])
+
             importer.retrieve_resources(helper.parse_opts(options))
             indexes = importer.get_indexes(args.first)
 
-            importer.process_import(indexes)
+            importer.process_import(indexes, options)
 
             importer.stdout
         rescue StandardError => e

data/bin/onezone

@@ -57,7 +57,7 @@ CommandParser::CmdParser.new(ARGV) do
     }
 
     DATABASE = {
-        :name  => 'database',
+        :name  => 'db',
         :large => '--db',
         :description => 'Also sync database'
     }

data/lib/cli_helper.rb

@@ -211,6 +211,17 @@ module CLIHelper
         end
     end
 
+    # Get text in green colour
+    #
+    # @param text [String] String to print
+    def self.green(text)
+        if $stdout.tty?
+            ANSI_GREEN + text + ANSI_RESET
+        else
+            text
+        end
+    end
+
     # Print header
     #
     # @param str       [String]  String with header content

data/lib/one_helper/onezone_helper.rb

@@ -101,8 +101,8 @@ class Replicator
 
     # Process files and folders
     #
-    # @param sync_db [Boolean] True to sync database
-    def process_files(sync_db)
+    # @param sync_database [Boolean] True to sync database
+    def process_files(sync_database)
         # Files to be copied
         copy_onedconf
 
@@ -118,7 +118,7 @@ class Replicator
         restart_services
 
         # Sync database
-        sync_db
+        sync_db if sync_database
     end
 
     private
@@ -127,14 +127,14 @@ class Replicator
     #
     # @param configs [Object] Configuration
     def fetch_db_config(configs)
-        configs.store(:backend, configs[:raw]['/TEMPLATE/DB/BACKEND'])
+        configs.store(:backend, configs[:raw]['/OPENNEBULA_CONFIGURATION/DB/BACKEND'])
 
         if configs[:backend] == 'mysql'
-            configs.store(:server, configs[:raw]['/TEMPLATE/DB/SERVER'])
-            configs.store(:user, configs[:raw]['/TEMPLATE/DB/USER'])
-            configs.store(:password, configs[:raw]['/TEMPLATE/DB/PASSWD'])
-            configs.store(:dbname, configs[:raw]['/TEMPLATE/DB/DB_NAME'])
-            configs.store(:port, configs[:raw]['/TEMPLATE/DB/PORT'])
+            configs.store(:server, configs[:raw]['/OPENNEBULA_CONFIGURATION/DB/SERVER'])
+            configs.store(:user, configs[:raw]['/OPENNEBULA_CONFIGURATION/DB/USER'])
+            configs.store(:password, configs[:raw]['/OPENNEBULA_CONFIGURATION/DB/PASSWD'])
+            configs.store(:dbname, configs[:raw]['/OPENNEBULA_CONFIGURATION/DB/DB_NAME'])
+            configs.store(:port, configs[:raw]['/OPENNEBULA_CONFIGURATION/DB/PORT'])
             configs[:port] = '3306' if configs[:port] == '0'
         else
             STDERR.puts 'No mysql backend configuration found'
@@ -147,9 +147,9 @@ class Replicator
     # @param configs [Object] Configuration
     def fetch_fed_config(configs)
         configs.store(:server_id,
-                      configs[:raw]['/TEMPLATE/FEDERATION/SERVER_ID'])
+                      configs[:raw]['/OPENNEBULA_CONFIGURATION/FEDERATION/SERVER_ID'])
         configs.store(:zone_id,
-                      configs[:raw]['/TEMPLATE/FEDERATION/ZONE_ID'])
+                      configs[:raw]['/OPENNEBULA_CONFIGURATION/FEDERATION/ZONE_ID'])
     end
 
     # Replaces a file with the version located on a remote server

data/share/schemas/xsd/index.xsd

@@ -23,6 +23,7 @@
     <xs:include schemaLocation="marketplaceapp.xsd"/>
     <xs:include schemaLocation="marketplace_pool.xsd"/>
     <xs:include schemaLocation="marketplace.xsd"/>
+    <xs:include schemaLocation="monitoring_data.xsd"/>
     <xs:include schemaLocation="opennebula_configuration.xsd"/>
     <xs:include schemaLocation="raftstatus.xsd"/>
     <xs:include schemaLocation="security_group_pool.xsd"/>

data/share/schemas/xsd/monitoring_data.xsd

@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified"
+  targetNamespace="http://opennebula.org/XMLSchema" xmlns="http://opennebula.org/XMLSchema">
+  <xs:element name="MONITORING_DATA">
+    <xs:complexType>
+      <xs:sequence>
+        <xs:element name="MONITORING" minOccurs="0" maxOccurs="unbounded">
+          <xs:complexType>
+            <xs:all>
+              <xs:element name="CPU" type="xs:decimal" minOccurs="0" maxOccurs="1"/>
+              <xs:element name="DISKRDBYTES" type="xs:integer" minOccurs="0" maxOccurs="1"/>
+              <xs:element name="DISKRDIOPS" type="xs:integer" minOccurs="0" maxOccurs="1"/>
+              <xs:element name="DISKWRBYTES" type="xs:integer" minOccurs="0" maxOccurs="1"/>
+              <xs:element name="DISKWRIOPS" type="xs:integer" minOccurs="0" maxOccurs="1"/>
+              <xs:element name="ID" type="xs:integer" minOccurs="0" maxOccurs="1"/>
+              <xs:element name="MEMORY" type="xs:integer" minOccurs="0" maxOccurs="1"/>
+              <xs:element name="NETTX" type="xs:integer" minOccurs="0" maxOccurs="1"/>
+              <xs:element name="NETRX" type="xs:integer" minOccurs="0" maxOccurs="1"/>
+              <xs:element name="TIMESTAMP" type="xs:integer" minOccurs="0" maxOccurs="1"/>
+              <xs:element name="VCENTER_ESX_HOST" type="xs:string" minOccurs="0" maxOccurs="1"/>
+              <xs:element name="VCENTER_GUEST_STATE" type="xs:string" minOccurs="0" maxOccurs="1"/>
+              <xs:element name="VCENTER_RP_NAME" type="xs:string" minOccurs="0" maxOccurs="1"/>
+              <xs:element name="VCENTER_VMWARETOOLS_RUNNING_STATUS" type="xs:string" minOccurs="0" maxOccurs="1"/>
+              <xs:element name="VCENTER_VMWARETOOLS_VERSION" type="xs:string" minOccurs="0" maxOccurs="1"/>
+              <xs:element name="VCENTER_VMWARETOOLS_VERSION_STATUS" type="xs:string" minOccurs="0" maxOccurs="1"/>
+              <xs:element name="VCENTER_VM_NAME" type="xs:string" minOccurs="0" maxOccurs="1"/>
+              <xs:element name="DISK_SIZE" minOccurs="0" maxOccurs="unbounded">
+                <xs:complexType>
+                  <xs:sequence>
+                    <xs:element name="ID" type="xs:integer"/>
+                    <xs:element name="SIZE" type="xs:integer"/>
+                  </xs:sequence>
+                </xs:complexType>
+              </xs:element>
+            </xs:all>
+          </xs:complexType>
+        </xs:element>
+      </xs:sequence>
+    </xs:complexType>
+  </xs:element>
+</xs:schema>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: opennebula-cli
 version: !ruby/object:Gem::Version
-  version: 5.13.85.pre
+  version: 5.13.90.pre
 platform: ruby
 authors:
 - OpenNebula
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-03-15 00:00:00.000000000 Z
+date: 2021-03-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: opennebula
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 5.13.85.pre
+        version: 5.13.90.pre
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 5.13.85.pre
+        version: 5.13.90.pre
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
@@ -93,6 +93,7 @@ files:
 - share/schemas/xsd/marketplace_pool.xsd
 - share/schemas/xsd/marketplaceapp.xsd
 - share/schemas/xsd/marketplaceapp_pool.xsd
+- share/schemas/xsd/monitoring_data.xsd
 - share/schemas/xsd/opennebula_configuration.xsd
 - share/schemas/xsd/raftstatus.xsd
 - share/schemas/xsd/security_group.xsd