opennebula-cli 6.0.0.1 → 6.0.0.2

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/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>

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.0.2
 platform: ruby
 authors:
 - OpenNebula
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-04-28 00:00:00.000000000 Z
+date: 2021-05-24 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.0.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 6.0.0.1
+        version: 6.0.0.2
 - !ruby/object:Gem::Dependency
   name: activesupport
   requirement: !ruby/object:Gem::Requirement
@@ -45,7 +45,6 @@ executables:
 - oneacl
 - onecluster
 - onedatastore
-- oneflow
 - oneflow-template
 - onegroup
 - onehook
@@ -64,6 +63,7 @@ executables:
 - onevnet
 - onevntemplate
 - onevrouter
+- oneflow
 - onezone
 extensions: []
 extra_rdoc_files: []
@@ -121,7 +121,6 @@ files:
 - bin/oneacl
 - bin/onecluster
 - bin/onedatastore
-- bin/oneflow
 - bin/oneflow-template
 - bin/onegroup
 - bin/onehook
@@ -140,6 +139,7 @@ files:
 - bin/onevnet
 - bin/onevntemplate
 - bin/onevrouter
+- bin/oneflow
 - bin/onezone
 - lib/cli_helper.rb
 - lib/command_parser.rb