From e8f0c4e9fcccee5970f94bfcbaaee826492fe176 Mon Sep 17 00:00:00 2001
From: Javi Fontan <jfontan@opennebula.org>
Date: Thu, 30 Jun 2016 16:04:35 +0200
Subject: [PATCH] feature #4613: define external ip attrs only in one place

---
 src/cli/one_helper/onevm_helper.rb         | 10 +---------
 src/oca/ruby/opennebula/virtual_machine.rb |  1 +
 2 files changed, 2 insertions(+), 9 deletions(-)

diff --git a/src/cli/one_helper/onevm_helper.rb b/src/cli/one_helper/onevm_helper.rb
index d72d30ff5c..328fe3f24c 100644
--- a/src/cli/one_helper/onevm_helper.rb
+++ b/src/cli/one_helper/onevm_helper.rb
@@ -45,14 +45,6 @@ private
     end
 end
 
-EXTERNAL_IP_ATTRS = [
-    'GUEST_IP',
-    'AWS_IP_ADDRESS',
-    'AWS_PRIVATE_IP_ADDRESS',
-    'AZ_IPADDRESS',
-    'SL_PRIMARYIPADDRESS'
-];
-
 
 class OneVMHelper < OpenNebulaHelper::OneHelper
     MULTIPLE={
@@ -528,7 +520,7 @@ in the frontend machine.
         # Find out if it is a hybrid VM to avoid showing local IPs
         isHybrid=false
         vm_monitoring.each{|key, value|
-            if EXTERNAL_IP_ATTRS.include? key
+            if VirtualMachine::EXTERNAL_IP_ATTRS.include? key
                 isHybrid=true
             end
         }
diff --git a/src/oca/ruby/opennebula/virtual_machine.rb b/src/oca/ruby/opennebula/virtual_machine.rb
index 9893c7d095..56e17003d6 100644
--- a/src/oca/ruby/opennebula/virtual_machine.rb
+++ b/src/oca/ruby/opennebula/virtual_machine.rb
@@ -213,6 +213,7 @@ module OpenNebula
         EXTERNAL_IP_ATTRS = [
             'GUEST_IP',
             'AWS_IP_ADDRESS',
+            'AWS_PRIVATE_IP_ADDRESS',
             'AZ_IPADDRESS',
             'SL_PRIMARYIPADDRESS'
         ]