From 3b5671455a5912159c9fd0a7a9fd81a7d96b7f2b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Petr=20Ospal=C3=BD?= Date: Wed, 13 May 2020 07:59:12 +0200 Subject: [PATCH] F OpenNebula/addon-context-linux#83: Add metric MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Petr Ospalý --- share/etc/oned.conf | 2 ++ src/vm/VirtualMachineContext.cc | 2 ++ 2 files changed, 4 insertions(+) diff --git a/share/etc/oned.conf b/share/etc/oned.conf index 7d190a0ba4..fe57e3479e 100644 --- a/share/etc/oned.conf +++ b/share/etc/oned.conf @@ -1062,6 +1062,8 @@ INHERIT_VNET_ATTR = "FILTER" INHERIT_VNET_ATTR = "FILTER_IP_SPOOFING" INHERIT_VNET_ATTR = "FILTER_MAC_SPOOFING" INHERIT_VNET_ATTR = "MTU" +INHERIT_VNET_ATTR = "METRIC" +INHERIT_VNET_ATTR = "METRIC6" INHERIT_VNET_ATTR = "INBOUND_AVG_BW" INHERIT_VNET_ATTR = "INBOUND_PEAK_BW" INHERIT_VNET_ATTR = "INBOUND_PEAK_KB" diff --git a/src/vm/VirtualMachineContext.cc b/src/vm/VirtualMachineContext.cc index a5e27afe5f..4c1f1d299c 100644 --- a/src/vm/VirtualMachineContext.cc +++ b/src/vm/VirtualMachineContext.cc @@ -49,6 +49,7 @@ const std::vector NETWORK_CONTEXT = { {"DNS", "DNS", "", true}, {"SEARCH_DOMAIN", "SEARCH_DOMAIN", "", true}, {"MTU", "GUEST_MTU", "", true}, + {"METRIC", "METRIC", "", true}, {"VLAN_ID", "VLAN_ID", "", true}, {"VROUTER_IP", "VROUTER_IP", "", false}, {"VROUTER_MANAGEMENT", "VROUTER_MANAGEMENT", "", false}, @@ -59,6 +60,7 @@ const std::vector NETWORK6_CONTEXT = { {"IP6", "IP6_GLOBAL", "IP6", false}, {"IP6_ULA", "IP6_ULA", "", false}, {"GATEWAY6", "GATEWAY6", "", true}, + {"METRIC6", "METRIC6", "", true}, {"CONTEXT_FORCE_IPV4", "CONTEXT_FORCE_IPV4", "", true}, {"IP6_PREFIX_LENGTH", "PREFIX_LENGTH", "", true}, {"VROUTER_IP6", "VROUTER_IP6_GLOBAL", "VROUTER_IP6", false},