etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #964 from snuf/Ovm3NetLabelFix 

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, labels at zone creation still works.

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 based on the other tarffic labels in those languages.

* pr/964:
  FIX: Ovm3 physical network traffic labels to work.

Signed-off-by: Remi Bergsma <github@remi.nl>
This commit is contained in:
Remi Bergsma 2015-10-26 06:08:42 +01:00
parent 7d73e9bfaf 1022883749
commit 0fd3919e8a
14 changed files with 25 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
client/WEB-INF/classes/resources/messages.properties
View File

@ -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

1
client/WEB-INF/classes/resources/messages_fr_FR.properties
View File

@ -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

2
client/WEB-INF/classes/resources/messages_it_IT.properties
View File

@ -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

1
client/WEB-INF/classes/resources/messages_ja_JP.properties
View File

@ -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

2
client/WEB-INF/classes/resources/messages_ko_KR.properties
View File

@ -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

1
client/WEB-INF/classes/resources/messages_nb_NO.properties
View File

@ -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

3
client/WEB-INF/classes/resources/messages_nl_NL.properties
View File

@ -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

1
client/WEB-INF/classes/resources/messages_pt_BR.properties
View File

@ -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

2
client/WEB-INF/classes/resources/messages_ru_RU.properties
View File

@ -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

1
client/WEB-INF/classes/resources/messages_zh_CN.properties
View File

@ -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

4
engine/schema/src/com/cloud/network/dao/PhysicalNetworkTrafficTypeDaoImpl.java
View File

@ -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;

1
server/src/com/cloud/api/ApiResponseHelper.java
View File

@ -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;

8
server/src/com/cloud/network/NetworkServiceImpl.java
View File

@ -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;
}

1
ui/dictionary.jsp
View File

@ -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" />',