shaba/one
1
0
Fork 0
mirror of https://github.com/OpenNebula/one.git synced 2025-03-22 18:50:08 +03:00
Code Releases Wiki Activity

L #3264: Corrections over last linting (#3396)

Browse Source 
Change remaining is_cd? calls in virtual_machine.rb and vm_disk.rb
Also changed on vcenter-13-VM_Save_spec.rb and
vcenter-97-Add_New_Disk.rb files
This commit is contained in:
Angel Luis Moya Gonzalez 2019-06-02 02:40:53 +02:00 committed by Tino Vázquez
parent 7466813970
commit d59d0bf53c
2 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/vmm_mad/remotes/lib/vcenter_driver/virtual_machine.rb
View File

@ -15,6 +15,20 @@
#--------------------------------------------------------------------------- #
module VCenterDriver
ONE_LOCATION = ENV['ONE_LOCATION']
if !ONE_LOCATION
RUBY_LIB_LOCATION = '/usr/lib/one/ruby'
else
RUBY_LIB_LOCATION = ONE_LOCATION + '/lib/ruby'
end
$LOAD_PATH << RUBY_LIB_LOCATION
require 'vm_device'
require 'vm_helper'
require 'vm_monitor'
class VirtualMachine < VCenterDriver::Template
# Supported access to VirtualMachineDevice classes:
@ -22,11 +36,8 @@ module VCenterDriver
# Disk
# VirtualMachineDevice::Disk
# VCenterDriver::VirtualMachine::Disk
require_relative 'vm_device'
include VirtualMachineDevice
require_relative 'vm_helper'
include VirtualMachineHelper
require_relative 'vm_monitor'
include VirtualMachineMonitor
############################################################################

2
src/vmm_mad/remotes/lib/vcenter_driver/virtual_machine_device/vm_disk.rb
View File

@ -175,7 +175,7 @@ module VirtualMachineDevice
end
def destroy
return if is_cd?
return if cd?
raise_if_no_exists_in_vcenter