opennebula-cli 6.0.0.1 → 6.0.3

data/lib/one_helper/onezone_helper.rb

@@ -77,6 +77,12 @@ class Replicator
         @l_config_elements = { :raw => @l_config }
         @l_fed_elements    = { :raw => @l_config }
 
+        if OpenNebula.is_error?(@l_config)
+            STDERR.puts 'Unable to read OpenNebula configuration. ' \
+                        'Is OpenNebula running?'
+            exit(-1)
+        end
+
         fetch_db_config(@l_config_elements)
         fetch_fed_config(@l_fed_elements)
 
@@ -129,7 +135,7 @@ class Replicator
     def fetch_db_config(configs)
         configs.store(:backend, configs[:raw]['/OPENNEBULA_CONFIGURATION/DB/BACKEND'])
 
-        if configs[:backend] == 'mysql'
+        if configs[:backend] == 'mysql' || configs[:backend] == 'postgresql'
             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'])
@@ -137,7 +143,7 @@ class Replicator
             configs.store(:port, configs[:raw]['/OPENNEBULA_CONFIGURATION/DB/PORT'])
             configs[:port] = '3306' if configs[:port] == '0'
         else
-            STDERR.puts 'No mysql backend configuration found'
+            STDERR.puts 'No mysql or postgresql backend configuration found'
             exit(-1)
         end
     end
@@ -305,7 +311,8 @@ class Replicator
              'this could take a while'
 
         ssh(
-            "onedb backup -f -u #{@r_config_elements[:user]} " \
+            "onedb backup -f -t #{@r_config_elements[:backend]} " \
+            "-u #{@r_config_elements[:user]} " \
             "-p #{@r_config_elements[:password]} " \
             "-d #{@r_config_elements[:dbname]} " \
             "-P #{@r_config_elements[:port]} /tmp/one_db_dump.sql"
@@ -320,7 +327,8 @@ class Replicator
         puts 'Restoring database'
 
         run_command(
-            "onedb restore -f -u #{@l_config_elements[:user]} " \
+            "onedb restore -f -t #{@l_config_elements[:backend]}" \
+            "-u #{@l_config_elements[:user]} " \
             "-p #{@l_config_elements[:password]} " \
             "-d #{@l_config_elements[:dbname]} " \
             "-P #{@l_config_elements[:port]} " \

data/share/schemas/xsd/api_info.xsd

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- The information sent to the hook when $API is used in an API Hook follos the following schema   -->
+<!-- The information sent to the hook when $API is used in an API Hook follow the following schema   -->
 <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns="http://opennebula.org/XMLSchema" elementFormDefault="qualified" targetNamespace="http://opennebula.org/XMLSchema">
   <xs:element name="CALL_INFO">
     <xs:complexType>
@@ -13,7 +13,7 @@
                 <xs:complexType>
                   <xs:sequence>
                     <xs:element name="POSITION" type="xs:integer"/>
-                    <xs:element name="TYPE" type="xs:integer">
+                    <xs:element name="TYPE" type="xs:string">
                       <xs:simpleType>
                         <xs:restriction base="xs:string">
                         <xs:enumeration value="IN"/>

data/share/schemas/xsd/hook_message_api.xsd

@@ -6,7 +6,7 @@
       <xs:sequence>
         <xs:element name="HOOK_TYPE" type="xs:string" fixed="API"/>
         <xs:element name="CALL" type="xs:string"/>
-         <!-- CALL_INFO type is defined in call_info.xsd   -->
+         <!-- CALL_INFO type is defined in api_info.xsd   -->
         <xs:element ref="CALL_INFO" maxOccurs="unbounded" minOccurs="0"/>
       </xs:sequence>
     </xs:complexType>

data/share/schemas/xsd/hook_message_state.xsd

@@ -16,7 +16,7 @@
         <xs:element name="STATE" type="xs:string"/>
         <xs:element name="LCM_STATE" type="xs:string" maxOccurs="1" minOccurs="0"/>
         <xs:element name="REMOTE_HOST" type="xs:string" maxOccurs="1" minOccurs="0"/>
-         <!-- The template of the resource (VM or Host) is inlcuded here -->
+         <!-- The template of the resource (VM or Host) is included here -->
          <xs:element ref="HOST" maxOccurs="1" minOccurs="0"/>
          <xs:element ref="VM" maxOccurs="1" minOccurs="0"/>
       </xs:sequence>

data/share/schemas/xsd/marketplace.xsd

@@ -10,6 +10,7 @@
         <xs:element name="UNAME" type="xs:string"/>
         <xs:element name="GNAME" type="xs:string"/>
         <xs:element name="NAME" type="xs:string"/>
+        <xs:element name="STATE" type="xs:integer"/>
         <xs:element name="MARKET_MAD" type="xs:string"/>
         <xs:element name="ZONE_ID" type="xs:string"/>
         <xs:element name="TOTAL_MB" type="xs:integer"/>

data/share/schemas/xsd/opennebula_configuration.xsd

@@ -270,6 +270,7 @@
         <xs:element name="RPC_LOG" type="xs:string" minOccurs="0" maxOccurs="1"/>
         <xs:element name="SCRIPTS_REMOTE_DIR" type="xs:string" minOccurs="0" maxOccurs="1"/>
         <xs:element name="SESSION_EXPIRATION_TIME" type="xs:integer" minOccurs="0" maxOccurs="1"/>
+        <xs:element name="SHOWBACK_ONLY_RUNNING" type="xs:string" minOccurs="0" maxOccurs="1"/>
         <xs:element name="TIMEOUT" type="xs:integer" minOccurs="0" maxOccurs="1"/>
 
         <xs:element name="TM_MAD" minOccurs="0" maxOccurs="unbounded">

data/share/schemas/xsd/vnet.xsd

@@ -103,6 +103,8 @@
                     <xs:element name="IP6_GLOBAL_END" type="xs:string" minOccurs="0"/>
                     <xs:element name="IP6" type="xs:string" minOccurs="0"/>
                     <xs:element name="IP6_END" type="xs:string" minOccurs="0"/>
+                    <xs:element name="PORT_START" type="xs:string" minOccurs="0"/>
+                    <xs:element name="PORT_SIZE" type="xs:string" minOccurs="0"/>
                     <xs:element name="USED_LEASES" type="xs:string"/>
                     <xs:element name="LEASES" minOccurs="0" maxOccurs="1">
                       <xs:complexType>

data/share/schemas/xsd/zone_pool.xsd

@@ -2,7 +2,7 @@
 <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="ZONE_POOL">
-    <xs:element name="ZONE">
+    <xs:element name="ZONE" minOccurs="1" maxOccurs="unbounded">
       <xs:complexType>
         <xs:sequence>
           <xs:element name="ID" type="xs:integer"/>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: opennebula-cli
 version: !ruby/object:Gem::Version
-  version: 6.0.0.1
+  version: 6.0.3
 platform: ruby
 authors:
 - OpenNebula
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-04-28 00:00:00.000000000 Z
+date: 2021-07-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: opennebula
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 6.0.0.1
+        version: 6.0.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 6.0.0.1
+        version: 6.0.3
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
@@ -59,11 +59,11 @@ executables:
 - oneuser
 - onevcenter
 - onevdc
-- onevm
 - onevmgroup
 - onevnet
 - onevntemplate
 - onevrouter
+- onevm
 - onezone
 extensions: []
 extra_rdoc_files: []
@@ -93,7 +93,6 @@ 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
@@ -103,10 +102,8 @@ files:
 - share/schemas/xsd/user_pool.xsd
 - share/schemas/xsd/vdc.xsd
 - share/schemas/xsd/vdc_pool.xsd
-- share/schemas/xsd/vm.xsd
 - share/schemas/xsd/vm_group.xsd
 - share/schemas/xsd/vm_group_pool.xsd
-- share/schemas/xsd/vm_pool.xsd
 - share/schemas/xsd/vmtemplate.xsd
 - share/schemas/xsd/vmtemplate_pool.xsd
 - share/schemas/xsd/vnet.xsd
@@ -115,6 +112,9 @@ files:
 - share/schemas/xsd/vntemplate_pool.xsd
 - share/schemas/xsd/vrouter.xsd
 - share/schemas/xsd/vrouter_pool.xsd
+- share/schemas/xsd/monitoring_data.xsd
+- share/schemas/xsd/vm.xsd
+- share/schemas/xsd/vm_pool.xsd
 - share/schemas/xsd/zone.xsd
 - share/schemas/xsd/zone_pool.xsd
 - bin/oneacct
@@ -135,11 +135,11 @@ files:
 - bin/oneuser
 - bin/onevcenter
 - bin/onevdc
-- bin/onevm
 - bin/onevmgroup
 - bin/onevnet
 - bin/onevntemplate
 - bin/onevrouter
+- bin/onevm
 - bin/onezone
 - lib/cli_helper.rb
 - lib/command_parser.rb
@@ -162,11 +162,11 @@ files:
 - lib/one_helper/oneuser_helper.rb
 - lib/one_helper/onevcenter_helper.rb
 - lib/one_helper/onevdc_helper.rb
-- lib/one_helper/onevm_helper.rb
 - lib/one_helper/onevmgroup_helper.rb
 - lib/one_helper/onevnet_helper.rb
 - lib/one_helper/onevntemplate_helper.rb
 - lib/one_helper/onevrouter_helper.rb
+- lib/one_helper/onevm_helper.rb
 - lib/one_helper/onezone_helper.rb
 - NOTICE
 - LICENSE