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

B #4361: add NIC_ALIAS to onegate vm show (#4362)

Browse Source 
Signed-off-by: Anton Todorov <a.todorov@storpool.com>
This commit is contained in:
Anton Todorov 2020-03-16 14:46:42 +02:00 committed by GitHub
parent cb1b90446a
commit 66caf86e36
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/onegate/onegate-server.rb
View File

@ -381,7 +381,7 @@ helpers do
end
end
NIC_VALID_KEYS = %w(IP IP6_LINK IP6_SITE IP6_GLOBAL NETWORK MAC)
NIC_VALID_KEYS = %w(IP IP6_LINK IP6_SITE IP6_GLOBAL NETWORK MAC NAME PARENT)
USER_TEMPLATE_INVALID_KEYS = %w(SCHED_MESSAGE)
def build_vm_hash(vm_hash)
@ -393,6 +393,14 @@ def build_vm_hash(vm_hash)
end
end
alias_nics = []
if vm_hash["TEMPLATE"]["NIC_ALIAS"]
[vm_hash["TEMPLATE"]["NIC_ALIAS"]].flatten.each do |nic|
alias_nics << Hash[nic.select{|k,v| NIC_VALID_KEYS.include?(k)}]
end
end
OpenNebula::VirtualMachine::EXTERNAL_IP_ATTRS.each do |attr|
external_ip = vm_hash["MONITORING"][attr]
@ -411,7 +419,8 @@ def build_vm_hash(vm_hash)
!USER_TEMPLATE_INVALID_KEYS.include?(k)
}],
"TEMPLATE" => {
"NIC" => nics
"NIC" => nics,
"NIC_ALIAS" => alias_nics
}
}
}