Merge pull request #137 from mika-b/fix-backwards-compatibility-with-…

…ovirt-4.3 fix for backwards compatibility with ovirt 4.3
myoung34 · Jan 11, 2021 · 17197f3 · 17197f3
2 parents 0309721 + 9d1ef6b
commit 17197f3
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 3 deletions.
diff --git a/lib/vagrant-ovirt4/action/read_ssh_info.rb b/lib/vagrant-ovirt4/action/read_ssh_info.rb
@@ -36,7 +36,12 @@ def read_ssh_info(env)
 
           nics_service = server.nics_service
           nics = nics_service.list
-          ip_addr = nics.collect { |nic_attachment| env[:connection].follow_link(nic_attachment.reported_devices).collect { |dev| dev.ips.collect { |ip| ip.address if ip.version == 'v4' } unless dev.ips.nil? } }.flatten.reject { |ip| ip.nil? }.first rescue nil
+          begin
+            ip_addr = nics.collect { |nic_attachment| env[:connection].follow_link(nic_attachment.reported_devices).collect { |dev| dev.ips.collect { |ip| ip.address if ip.version == 'v4' } unless dev.ips.nil? } }.flatten.reject { |ip| ip.nil? }.first
+          rescue
+            # for backwards compatibility with ovirt 4.3
+            ip_addr = nics.collect { |nic_attachment| env[:connection].follow_link(nic_attachment).reported_devices.collect { |dev| dev.ips.collect { |ip| ip.address if ip.version == 'v4' } unless dev.ips.nil? } }.flatten.reject { |ip| ip.nil? }.first rescue nil
+          end
 
           # Return the info
           # TODO: Some info should be configurable in Vagrantfile

diff --git a/lib/vagrant-ovirt4/action/read_state.rb b/lib/vagrant-ovirt4/action/read_state.rb
@@ -33,7 +33,13 @@ def read_state(env)
           end
           nics_service = server.nics_service
           nics = nics_service.list
-          ip_addr = nics.collect { |nic_attachment| env[:connection].follow_link(nic_attachment.reported_devices).collect { |dev| dev.ips.collect { |ip| ip.address if ip.version == 'v4' } unless dev.ips.nil? } }.flatten.reject { |ip| ip.nil? }.first rescue nil
+          begin
+            ip_addr = nics.collect { |nic_attachment| env[:connection].follow_link(nic_attachment.reported_devices).collect { |dev| dev.ips.collect { |ip| ip.address if ip.version == 'v4' } unless dev.ips.nil? } }.flatten.reject { |ip| ip.nil? }.first
+          rescue
+            # for backwards compatibility with ovirt 4.3
+            ip_addr = nics.collect { |nic_attachment| env[:connection].follow_link(nic_attachment).reported_devices.collect { |dev| dev.ips.collect { |ip| ip.address if ip.version == 'v4' } unless dev.ips.nil? } }.flatten.reject { |ip| ip.nil? }.first rescue nil
+          end
+
           unless ip_addr.nil?
             env[:ip_address] = ip_addr
             @logger.debug("Got output #{env[:ip_address]}")

diff --git a/lib/vagrant-ovirt4/action/wait_till_up.rb b/lib/vagrant-ovirt4/action/wait_till_up.rb
@@ -57,7 +57,13 @@ def call(env)
 
               nics_service = server.nics_service
               nics = nics_service.list
-              ip_addr = nics.collect { |nic_attachment| env[:connection].follow_link(nic_attachment.reported_devices).collect { |dev| dev.ips.collect { |ip| ip.address if ip.version == 'v4' } unless dev.ips.nil? } }.flatten.reject { |ip| ip.nil? }.first rescue nil
+              begin
+                ip_addr = nics.collect { |nic_attachment| env[:connection].follow_link(nic_attachment.reported_devices).collect { |dev| dev.ips.collect { |ip| ip.address if ip.version == 'v4' } unless dev.ips.nil? } }.flatten.reject { |ip| ip.nil? }.first
+              rescue
+                # for backwards compatibility with ovirt 4.3
+                ip_addr = nics.collect { |nic_attachment| env[:connection].follow_link(nic_attachment).reported_devices.collect { |dev| dev.ips.collect { |ip| ip.address if ip.version == 'v4' } unless dev.ips.nil? } }.flatten.reject { |ip| ip.nil? }.first rescue nil
+              end
+
               unless ip_addr.nil?
                 env[:ui].info("Got IP: #{ip_addr}")
                 # Check if SSH-Server is up