opennebula 5.13.80.pre → 6.0.0.2

data/lib/vm_template.rb

@@ -602,7 +602,7 @@ module VCenterDriver
         def nic_alias_from_nic(id, nic, nic_index, network_found, vm_object)
             nic_tmp = ''
 
-            nic_alias_index = 1
+            nic_alias_index = 0
             if nic[:ipv4_additionals]
                 nic[:ipv4_additionals].split(',').each do |ipv4_additional|
                     ipv4, ipv6 =
@@ -625,8 +625,8 @@ module VCenterDriver
                     nic_tmp << "NETWORK_ID=\"#{id}\",\n"
                     nic_tmp << "IP=\"#{ipv4_additional}\",\n"
                     nic_tmp <<
-                        "NAME=\"NIC#{nic_index}_ALIAS#{nic_alias_index}\",\n"
-                    nic_tmp << "PARENT=\"NIC#{nic_index}\"\n"
+                        "NAME=\"VC_NIC#{nic_index}_ALIAS#{nic_alias_index}\",\n"
+                    nic_tmp << "PARENT=\"VC_NIC#{nic_index}\"\n"
                     nic_tmp << "]\n"
                     nic_alias_index += 1
                 end
@@ -653,8 +653,8 @@ module VCenterDriver
                     nic_tmp << "NETWORK_ID=\"#{id}\",\n"
                     nic_tmp << "IP6=\"#{ipv6_additional}\",\n"
                     nic_tmp <<
-                        "NAME=\"NIC#{nic_index}_ALIAS#{nic_alias_index}\",\n"
-                    nic_tmp << "PARENT=\"NIC#{nic_index}\"\n"
+                        "NAME=\"VC_NIC#{nic_index}_ALIAS#{nic_alias_index}\",\n"
+                    nic_tmp << "PARENT=\"VC_NIC#{nic_index}\"\n"
                     nic_tmp << "]\n"
                     nic_alias_index += 1
                 end
@@ -666,7 +666,7 @@ module VCenterDriver
         def nic_from_network_created(one_vn, nic, nic_index, vm_object, _ar_ids)
             nic_tmp = "NIC=[\n"
             nic_tmp << "NETWORK_ID=\"#{one_vn.id}\",\n"
-            nic_tmp << "NAME =\"NIC#{nic_index}\",\n"
+            nic_tmp << "NAME =\"VC_NIC#{nic_index}\",\n"
 
             if vm?
                 if nic[:mac]
@@ -716,7 +716,7 @@ module VCenterDriver
         )
             nic_tmp = "NIC=[\n"
             nic_tmp << "NETWORK_ID=\"#{network_found['ID']}\",\n"
-            nic_tmp << "NAME =\"NIC#{nic_index}\",\n"
+            nic_tmp << "NAME =\"VC_NIC#{nic_index}\",\n"
 
             if vm?
                 ipv4, ipv6 = find_ips_in_network(network_found, vm_object,
@@ -1014,7 +1014,7 @@ module VCenterDriver
                 # Track allocated networks for rollback
                 allocated_networks = []
 
-                nic_index = 1
+                nic_index = 0
 
                 vc_nics.each do |nic|
                     # Check if the network already exists
@@ -1573,9 +1573,8 @@ module VCenterDriver
             str << "]\n"
 
             if annotation.nil? || annotation.empty?
-                str << 'DESCRIPTION = "vCenter Template \
-                imported by OpenNebula' \
-                    " from Cluster #{ccr_name}\"\n"
+                str << 'DESCRIPTION = "vCenter Template imported by OpenNebula'\
+                       " from Cluster #{ccr_name}\"\n"
             else
                 notes = annotation.gsub('\\', '\\\\').gsub('"', '\\"')
                 str << "DESCRIPTION = \"#{notes}\"\n"
@@ -1659,10 +1658,12 @@ module VCenterDriver
                 folders = []
                 until item.instance_of? RbVmomi::VIM::Datacenter
                     item = item.parent
-                    first_condition = item.instance_of? RbVmomi::VIM::Datacenter
-                    second_condition = item.name != 'vm'
+                    first_condition =
+                        !(item.instance_of? RbVmomi::VIM::Datacenter)
+                    second_condition =
+                        item.name != 'vm'
 
-                    unless first_condition && second_condition
+                    if first_condition && second_condition
                         folders << item.name
                     end
                     if item.nil?
@@ -1693,8 +1694,8 @@ module VCenterDriver
                 one_tmp[:dc_name]               = dc_name
                 one_tmp[:template_name]         = template_name
                 one_tmp[:sunstone_template_name]=
-                    "#{template_name} [ Cluster: #{template_ccr_name} \
-                    - Template location: #{location} ]"
+                    "#{template_name} [ Cluster: #{template_ccr_name}" \
+                    " - Template location: #{location} ]"
                 one_tmp[:template_location]     = location
                 one_tmp[:vcenter_ccr_ref]       = template_ccr_ref
                 one_tmp[:vcenter_ref]           = template_ref

data/lib/vmm_importer.rb

@@ -54,6 +54,14 @@ module VCenterDriver
 
             vc_vm = VCenterDriver::VirtualMachine.new_without_id(@vi_client,
                                                                  vm_ref)
+
+            # Importing Wild VMs with snapshots is not supported
+            # https://github.com/OpenNebula/one/issues/1268
+            if vc_vm.snapshots? && vc_vm.disk_keys.empty?
+                raise 'Disk metadata not present and snapshots exist, '\
+                      'cannot import this VM'
+            end
+
             vname = vc_vm['name']
 
             type = { :object => 'VM', :id => vname }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: opennebula
 version: !ruby/object:Gem::Version
-  version: 5.13.80.pre
+  version: 6.0.0.2
 platform: ruby
 authors:
 - OpenNebula
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-02-28 00:00:00.000000000 Z
+date: 2021-05-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -223,14 +223,14 @@ files:
 - lib/opennebula/xml_element.rb
 - lib/opennebula/xml_pool.rb
 - lib/opennebula/xml_utils.rb
-- lib/opennebula/zone.rb
 - lib/opennebula/zone_pool.rb
+- lib/opennebula/zone.rb
 - lib/opennebula/flow/grammar.rb
 - lib/opennebula/flow/service_pool.rb
-- lib/opennebula/flow/service_template.rb
 - lib/opennebula/flow/service_template_ext.rb
 - lib/opennebula/flow/service_template_pool.rb
 - lib/opennebula/flow/validator.rb
+- lib/opennebula/flow/service_template.rb
 - lib/opennebula/ldap_auth.rb
 - lib/opennebula/ldap_auth_spec.rb
 - lib/opennebula/server_cipher_auth.rb
@@ -255,9 +255,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>'
+  - - '>='
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.0.14.1