From d59d0bf53c7f2ff17dd4645016d616690965ba5c Mon Sep 17 00:00:00 2001
From: Angel Luis Moya Gonzalez <amoya@opennebula.systems>
Date: Sun, 2 Jun 2019 02:40:53 +0200
Subject: [PATCH] L #3264: Corrections over last linting (#3396)

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
---
 .../lib/vcenter_driver/virtual_machine.rb       | 17 ++++++++++++++---
 .../virtual_machine_device/vm_disk.rb           |  2 +-
 2 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/src/vmm_mad/remotes/lib/vcenter_driver/virtual_machine.rb b/src/vmm_mad/remotes/lib/vcenter_driver/virtual_machine.rb
index 412da3012f..6f8a90cb1f 100644
--- a/src/vmm_mad/remotes/lib/vcenter_driver/virtual_machine.rb
+++ b/src/vmm_mad/remotes/lib/vcenter_driver/virtual_machine.rb
@@ -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
 
         ############################################################################
diff --git a/src/vmm_mad/remotes/lib/vcenter_driver/virtual_machine_device/vm_disk.rb b/src/vmm_mad/remotes/lib/vcenter_driver/virtual_machine_device/vm_disk.rb
index 46c25c52d4..7ebf32e81a 100644
--- a/src/vmm_mad/remotes/lib/vcenter_driver/virtual_machine_device/vm_disk.rb
+++ b/src/vmm_mad/remotes/lib/vcenter_driver/virtual_machine_device/vm_disk.rb
@@ -175,7 +175,7 @@ module VirtualMachineDevice
         end
 
         def destroy
-            return if is_cd?
+            return if cd?
 
             raise_if_no_exists_in_vcenter