From b309d034d9ac711a9fc3aaa352c52bb718f4b331 Mon Sep 17 00:00:00 2001 From: Tino Vazquez Date: Mon, 20 Apr 2020 11:51:17 +0200 Subject: [PATCH] Revert "M #-: Minor fix at save_as (#4554)" This reverts commit 78557ae30250a3215ed360d63387d41164e6ef63. --- src/oca/ruby/opennebula/virtual_machine.rb | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/src/oca/ruby/opennebula/virtual_machine.rb b/src/oca/ruby/opennebula/virtual_machine.rb index e3bc763c7f..e5c129fa57 100644 --- a/src/oca/ruby/opennebula/virtual_machine.rb +++ b/src/oca/ruby/opennebula/virtual_machine.rb @@ -779,7 +779,7 @@ module OpenNebula # @return [Integer, OpenNebula::Error] the new Template ID in case of # success, error otherwise REMOVE_VNET_ATTRS = %w{AR_ID BRIDGE CLUSTER_ID IP MAC TARGET NIC_ID - VN_MAD SECURITY_GROUPS VLAN_ID} + NETWORK_ID VN_MAD SECURITY_GROUPS VLAN_ID} REMOVE_IMAGE_ATTRS = %w{DEV_PREFIX SOURCE ORIGINAL_SIZE SIZE DISK_SNAPSHOT_TOTAL_SIZE DRIVER IMAGE_STATE SAVE CLONE READONLY @@ -917,10 +917,6 @@ module OpenNebula nic.delete_element(attr) end - if !nic['NETWORK_NAME'].empty? && !nic['NETNETWORK_UNAME'].empty? - nic.delete_element('NETWORK_ID') - end - replace << "NIC = [ " << nic.template_like_str(".").tr("\n", ",\n") << " ] \n" end