From 10228837493ee7a0bd370c86a87f7ab0a3d220eb Mon Sep 17 00:00:00 2001
From: Funs Kessen <fkessen@schubergphilis.com>
Date: Thu, 22 Oct 2015 11:57:42 +0200
Subject: [PATCH] FIX: Ovm3 physical network traffic labels to work.

The labeling was broken. Only labels assigned at zone creation
were used, changing labels was not working. Tested with changing
a label and checking it.

As a bonus fixed the consistency of KVM in Dutch compared to other
traffic labels in dutch and copied in the OVM3 translated label
in other languages.
---
 client/WEB-INF/classes/resources/messages.properties      | 1 +
 .../WEB-INF/classes/resources/messages_fr_FR.properties   | 1 +
 .../WEB-INF/classes/resources/messages_it_IT.properties   | 2 ++
 .../WEB-INF/classes/resources/messages_ja_JP.properties   | 1 +
 .../WEB-INF/classes/resources/messages_ko_KR.properties   | 2 ++
 .../WEB-INF/classes/resources/messages_nb_NO.properties   | 1 +
 .../WEB-INF/classes/resources/messages_nl_NL.properties   | 3 ++-
 .../WEB-INF/classes/resources/messages_pt_BR.properties   | 1 +
 .../WEB-INF/classes/resources/messages_ru_RU.properties   | 2 ++
 .../WEB-INF/classes/resources/messages_zh_CN.properties   | 1 +
 .../network/dao/PhysicalNetworkTrafficTypeDaoImpl.java    | 4 ++--
 server/src/com/cloud/api/ApiResponseHelper.java           | 1 +
 server/src/com/cloud/network/NetworkServiceImpl.java      | 8 +++++++-
 ui/dictionary.jsp                                         | 1 +
 14 files changed, 25 insertions(+), 4 deletions(-)

diff --git a/client/WEB-INF/classes/resources/messages.properties b/client/WEB-INF/classes/resources/messages.properties
index cbf66ac9b1a..6cafdb01732 100644
--- a/client/WEB-INF/classes/resources/messages.properties
+++ b/client/WEB-INF/classes/resources/messages.properties
@@ -940,6 +940,7 @@ label.os.type=OS Type
 label.ovm3.vip=Master Vip IP
 label.ovm3.pool=Native Pooling
 label.ovm3.cluster=Native Clustering
+label.ovm3.traffic.label=OVM3 traffic label
 label.owned.public.ips=Owned Public IP Addresses
 label.owner.account=Owner Account
 label.owner.domain=Owner Domain
diff --git a/client/WEB-INF/classes/resources/messages_fr_FR.properties b/client/WEB-INF/classes/resources/messages_fr_FR.properties
index 0dc0f81969a..3bb751bff87 100644
--- a/client/WEB-INF/classes/resources/messages_fr_FR.properties
+++ b/client/WEB-INF/classes/resources/messages_fr_FR.properties
@@ -1125,6 +1125,7 @@ label.override.public.traffic=Remplacer Trafic-public
 label.ovm3.cluster=Cluster natif
 label.ovm3.pool=Pool natif
 label.ovm3.vip=IP Ma\u00eetre Vip
+label.ovm3.traffic.label=Libell\u00e9 trafic OVM3
 label.ovm.traffic.label=Libell\u00e9 trafic OVM
 label.ovs=OVS
 label.owned.public.ips=Adresses IP Publiques d\u00e9tenues
diff --git a/client/WEB-INF/classes/resources/messages_it_IT.properties b/client/WEB-INF/classes/resources/messages_it_IT.properties
index 554ac841d75..7100c63a0a0 100644
--- a/client/WEB-INF/classes/resources/messages_it_IT.properties
+++ b/client/WEB-INF/classes/resources/messages_it_IT.properties
@@ -469,6 +469,8 @@ label.number.of.virtual.routers=Numero dei Router Virtuali
 label.number.of.zones=Numero di Zone
 label.ok=OK
 label.order=Ordine
+label.ovm.traffic.label=Etichetta del traffico via OVM
+label.ovm3.traffic.label=Etichetta del traffico via OVM3
 label.perfect.forward.secrecy=Segretezza di Forward perfetta
 label.physical.network.ID=ID della rete fisica
 label.please.specify.netscaler.info=Si prega di specificare le informazioni per Netscaler
diff --git a/client/WEB-INF/classes/resources/messages_ja_JP.properties b/client/WEB-INF/classes/resources/messages_ja_JP.properties
index 8035e1cc622..64841d054d7 100644
--- a/client/WEB-INF/classes/resources/messages_ja_JP.properties
+++ b/client/WEB-INF/classes/resources/messages_ja_JP.properties
@@ -1098,6 +1098,7 @@ label.override.public.traffic=\u30d1\u30d6\u30ea\u30c3\u30af \u30c8\u30e9\u30d5\
 label.ovm3.cluster=\u30cd\u30a4\u30c6\u30a3\u30d6\u30af\u30e9\u30b9\u30bf\u30fc
 label.ovm3.pool=\u30cd\u30a4\u30c6\u30a3\u30d6\u30d7\u30fc\u30eb
 label.ovm3.vip=\u30de\u30b9\u30bf\u30fc VIP IP
+label.ovm3.traffic.label=OVM3 \u306e\u30c8\u30e9\u30d5\u30a3\u30c3\u30af \u30e9\u30d9\u30eb
 label.ovm.traffic.label=OVM \u306e\u30c8\u30e9\u30d5\u30a3\u30c3\u30af \u30e9\u30d9\u30eb
 label.ovs=OVS
 label.owned.public.ips=\u6240\u6709\u3059\u308b\u30d1\u30d6\u30ea\u30c3\u30af IP \u30a2\u30c9\u30ec\u30b9
diff --git a/client/WEB-INF/classes/resources/messages_ko_KR.properties b/client/WEB-INF/classes/resources/messages_ko_KR.properties
index 3fe80b6b792..5559146e007 100644
--- a/client/WEB-INF/classes/resources/messages_ko_KR.properties
+++ b/client/WEB-INF/classes/resources/messages_ko_KR.properties
@@ -785,6 +785,8 @@ label.num.cpu.cores=CPU \ucf54\uc5b4\uc218
 label.numretries=\uc7ac\uc2dc\ud589 \ud68c\uc218
 label.ocfs2=OCFS2
 label.offer.ha=\uace0\uac00\uc6a9\uc131 \uc81c\uacf5
+label.ovm.traffic.label=OVM \ud2b8\ub798\ud53d \ub77c\ubca8
+label.ovm3.traffic.label=OVM3 \ud2b8\ub798\ud53d \ub77c\ubca8
 label.ok=\ud655\uc778
 label.optional=\uc635\uc158
 label.order=\uc21c\uc11c
diff --git a/client/WEB-INF/classes/resources/messages_nb_NO.properties b/client/WEB-INF/classes/resources/messages_nb_NO.properties
index d063cac4860..c2f79b01f55 100644
--- a/client/WEB-INF/classes/resources/messages_nb_NO.properties
+++ b/client/WEB-INF/classes/resources/messages_nb_NO.properties
@@ -893,6 +893,7 @@ label.optional=Valgfritt
 label.order=Rekkef\u00f8lge
 label.os.type=OS-type
 label.other=Andre
+label.ovm3.traffic.label=OVM3 trafikketikett
 label.ovs=OVS
 label.owner.account=Eierkonto
 label.owner.domain=Eierdomene
diff --git a/client/WEB-INF/classes/resources/messages_nl_NL.properties b/client/WEB-INF/classes/resources/messages_nl_NL.properties
index cb3f56f838d..010919dd3e4 100644
--- a/client/WEB-INF/classes/resources/messages_nl_NL.properties
+++ b/client/WEB-INF/classes/resources/messages_nl_NL.properties
@@ -771,7 +771,7 @@ label.item.listing=Items lijst
 label.keep=Bewaar
 label.keyboard.type=Toetsenbord type
 label.key=Sleutel
-label.kvm.traffic.label=KVM verkeer label
+label.kvm.traffic.label=KVM verkeerslabel
 label.label=Label
 label.lang.arabic=Arabisch
 label.lang.brportugese=Braziliaans Portgees
@@ -990,6 +990,7 @@ label.os.type=OS Type
 label.override.guest.traffic=Overschrijf Gast Verkeer
 label.override.public.traffic=Overschrijf Publiek Verkeer
 label.ovm.traffic.label=OVM verkeerslabel
+label.ovm3.traffic.label=OVM3 verkeerslabel
 label.ovs=OVS
 label.owned.public.ips=Publieke IP Adressen in beheer
 label.owner.account=Account Eigenaar
diff --git a/client/WEB-INF/classes/resources/messages_pt_BR.properties b/client/WEB-INF/classes/resources/messages_pt_BR.properties
index e951f9eadee..12315f4639e 100644
--- a/client/WEB-INF/classes/resources/messages_pt_BR.properties
+++ b/client/WEB-INF/classes/resources/messages_pt_BR.properties
@@ -1125,6 +1125,7 @@ label.override.public.traffic=Sobrep\u00f5e Tr\u00e1fego P\u00fablico
 label.ovm3.cluster=Native Clustering
 label.ovm3.pool=Native Pooling
 label.ovm3.vip=IP principal do Vip
+label.ovm3.traffic.label=R\u00f3tulo de tr\u00e1fego OVM3
 label.ovm.traffic.label=R\u00f3tulo de tr\u00e1fego OVM
 label.ovs=OVS
 label.owned.public.ips=IP P\u00fablico Utilizado
diff --git a/client/WEB-INF/classes/resources/messages_ru_RU.properties b/client/WEB-INF/classes/resources/messages_ru_RU.properties
index 172955e5fd0..4f9bdfd8014 100644
--- a/client/WEB-INF/classes/resources/messages_ru_RU.properties
+++ b/client/WEB-INF/classes/resources/messages_ru_RU.properties
@@ -882,6 +882,8 @@ label.optional=\u041d\u0435\u043e\u0431\u044f\u0437\u0430\u0442\u0435\u043b\u044
 label.order=\u041e\u0447\u0435\u0440\u0435\u0434\u044c
 label.os.preference=\u041f\u0440\u0435\u0434\u043f\u043e\u0447\u0442\u0438\u0442\u0435\u043b\u044c\u043d\u0430\u044f \u041e\u0421
 label.os.type=\u0422\u0438\u043f \u041e\u0421
+label.ovm3.traffic.label=\u041c\u0435\u0442\u043a\u0430 \u0442\u0440\u0430\u0444\u0438\u043a\u0430 OVM3
+label.ovm.traffic.label=\u041c\u0435\u0442\u043a\u0430 \u0442\u0440\u0430\u0444\u0438\u043a\u0430 OVM
 label.owned.public.ips=\u041f\u0440\u0438\u0441\u0432\u043e\u0435\u043d\u043d\u044b\u0435 \u043c\u0430\u0440\u0448\u0440\u0443\u0442\u0438\u0437\u0438\u0440\u0443\u0435\u043c\u044b\u0435 IP \u0430\u0434\u0440\u0435\u0441\u0430
 label.owner.account=\u0423\u0447\u0451\u0442\u043d\u0430\u044f \u0437\u0430\u043f\u0438\u0441\u044c \u0432\u043b\u0430\u0434\u0435\u043b\u044c\u0446\u0430
 label.owner.domain=\u0414\u043e\u043c\u0435\u043d \u0432\u043b\u0430\u0434\u0435\u043b\u044c\u0446\u0430
diff --git a/client/WEB-INF/classes/resources/messages_zh_CN.properties b/client/WEB-INF/classes/resources/messages_zh_CN.properties
index b5102069301..f2bb237d2d0 100644
--- a/client/WEB-INF/classes/resources/messages_zh_CN.properties
+++ b/client/WEB-INF/classes/resources/messages_zh_CN.properties
@@ -1048,6 +1048,7 @@ label.other=\u5176\u4ed6
 label.override.guest.traffic=\u66ff\u4ee3\u6765\u5bbe\u6d41\u91cf
 label.override.public.traffic=\u66ff\u4ee3\u516c\u5171\u6d41\u91cf
 label.ovm.traffic.label=OVM \u6d41\u91cf\u6807\u7b7e
+label.ovm3.traffic.label=OVM3 \u6d41\u91cf\u6807\u7b7e
 label.ovs=OVS
 label.owned.public.ips=\u62e5\u6709\u7684\u516c\u7528 IP \u5730\u5740\u6570
 label.owner.account=\u6240\u6709\u8005\u5e10\u6237
diff --git a/engine/schema/src/com/cloud/network/dao/PhysicalNetworkTrafficTypeDaoImpl.java b/engine/schema/src/com/cloud/network/dao/PhysicalNetworkTrafficTypeDaoImpl.java
index 5f2609dbf9b..fe7d49c4015 100644
--- a/engine/schema/src/com/cloud/network/dao/PhysicalNetworkTrafficTypeDaoImpl.java
+++ b/engine/schema/src/com/cloud/network/dao/PhysicalNetworkTrafficTypeDaoImpl.java
@@ -91,7 +91,7 @@ public class PhysicalNetworkTrafficTypeDaoImpl extends GenericDaoBase<PhysicalNe
         ovm3AllFieldsSearch = createSearchBuilder(String.class);
         ovm3AllFieldsSearch.and("physicalNetworkId", ovm3AllFieldsSearch.entity().getPhysicalNetworkId(), Op.EQ);
         ovm3AllFieldsSearch.and("trafficType", ovm3AllFieldsSearch.entity().getTrafficType(), Op.EQ);
-        ovm3AllFieldsSearch.selectFields(ovm3AllFieldsSearch.entity().getSimulatorNetworkLabel());
+        ovm3AllFieldsSearch.selectFields(ovm3AllFieldsSearch.entity().getOvm3NetworkLabel());
         ovm3AllFieldsSearch.done();
     }
 
@@ -132,7 +132,7 @@ public class PhysicalNetworkTrafficTypeDaoImpl extends GenericDaoBase<PhysicalNe
         } else if (hType == HypervisorType.Hyperv) {
             sc = hypervAllFieldsSearch.create();
         } else if (hType == HypervisorType.Ovm3) {
-            sc = hypervAllFieldsSearch.create();
+            sc = ovm3AllFieldsSearch.create();
         } else {
             assert (false) : "We don't handle this hypervisor type";
             return null;
diff --git a/server/src/com/cloud/api/ApiResponseHelper.java b/server/src/com/cloud/api/ApiResponseHelper.java
index 6ee7c26d581..00f1a277c4a 100644
--- a/server/src/com/cloud/api/ApiResponseHelper.java
+++ b/server/src/com/cloud/api/ApiResponseHelper.java
@@ -2470,6 +2470,7 @@ public class ApiResponseHelper implements ResponseGenerator {
         response.setKvmLabel(result.getKvmNetworkLabel());
         response.setVmwareLabel(result.getVmwareNetworkLabel());
         response.setHypervLabel(result.getHypervNetworkLabel());
+        response.setOvm3Label(result.getOvm3NetworkLabel());
 
         response.setObjectName("traffictype");
         return response;
diff --git a/server/src/com/cloud/network/NetworkServiceImpl.java b/server/src/com/cloud/network/NetworkServiceImpl.java
index abee17833fb..e50cbe74b86 100644
--- a/server/src/com/cloud/network/NetworkServiceImpl.java
+++ b/server/src/com/cloud/network/NetworkServiceImpl.java
@@ -3729,8 +3729,14 @@ public class NetworkServiceImpl extends ManagerBase implements  NetworkService {
             }
             trafficType.setHypervNetworkLabel(hypervLabel);
         }
-        _pNTrafficTypeDao.update(id, trafficType);
 
+        if (ovm3Label != null) {
+            if ("".equals(ovm3Label)) {
+                ovm3Label = null;
+            }
+            trafficType.setOvm3NetworkLabel(ovm3Label);
+        }
+        _pNTrafficTypeDao.update(id, trafficType);
         return trafficType;
     }
 
diff --git a/ui/dictionary.jsp b/ui/dictionary.jsp
index 4161498da3e..ed280de3af9 100644
--- a/ui/dictionary.jsp
+++ b/ui/dictionary.jsp
@@ -740,6 +740,7 @@ dictionary = {
 'label.ovm.traffic.label': '<fmt:message key="label.ovm.traffic.label" />',
 'label.lxc.traffic.label': '<fmt:message key="label.lxc.traffic.label" />',
 'label.hyperv.traffic.label': '<fmt:message key="label.hyperv.traffic.label" />',
+'label.ovm3.traffic.label': '<fmt:message key="label.ovm3.traffic.label" />',
 'label.lang.chinese': '<fmt:message key="label.lang.chinese" />',
 'label.lang.english': '<fmt:message key="label.lang.english" />',
 'label.lang.japanese': '<fmt:message key="label.lang.japanese" />',