apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-12-16 02:22:52 +01:00
Code Issues Packages Projects Releases Wiki Activity

Add support for OVM traffic labels in UI

Browse Source
This commit is contained in:
Brian Federle 2012-03-28 11:11:17 -07:00
parent 3e649a96ca
commit a199d1f7a2
3 changed files with 18 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

@ -3,6 +3,7 @@ label.management.ips=Management IP Addresses
label.devices=Devices label.devices=Devices
label.rules=Rules label.rules=Rules
label.traffic.label=Traffic label label.traffic.label=Traffic label
label.ovm.traffic.label=OVM traffic label
#new labels (end) ************************************************************************************************ #new labels (end) ************************************************************************************************

1
ui/index.jsp
View File

@ -1646,6 +1646,7 @@
<script language="javascript"> <script language="javascript">
dictionary = { dictionary = {
'label.ovm.traffic.label': '<fmt:message key="label.ovm.traffic.label"/>',
'label.traffic.label': '<fmt:message key="label.traffic.label"/>', 'label.traffic.label': '<fmt:message key="label.traffic.label"/>',
'label.management.ips': '<fmt:message key="label.management.ips"/>', 'label.management.ips': '<fmt:message key="label.management.ips"/>',
'label.edit.traffic.type': '<fmt:message key="label.edit.traffic.type"/>', 'label.edit.traffic.type': '<fmt:message key="label.edit.traffic.type"/>',

20
ui/scripts/system.js
View File

@ -90,6 +90,8 @@
trafficType.kvmnetworklabel = dictionary['label.network.label.display.for.blank.value']; trafficType.kvmnetworklabel = dictionary['label.network.label.display.for.blank.value'];
if(trafficType.vmwarenetworklabel == null || trafficType.vmwarenetworklabel == 0) if(trafficType.vmwarenetworklabel == null || trafficType.vmwarenetworklabel == 0)
trafficType.vmwarenetworklabel = dictionary['label.network.label.display.for.blank.value']; trafficType.vmwarenetworklabel = dictionary['label.network.label.display.for.blank.value'];
if(trafficType.ovmnetworklabel == null || trafficType.ovmnetworklabel == 0)
trafficType.ovmnetworklabel = dictionary['label.network.label.display.for.blank.value'];
return trafficType; return trafficType;
}; };
@ -102,6 +104,8 @@
array1.push("&kvmnetworklabel=" + labels.kvmnetworklabel); array1.push("&kvmnetworklabel=" + labels.kvmnetworklabel);
if(labels.vmwarenetworklabel != dictionary['label.network.label.display.for.blank.value']) if(labels.vmwarenetworklabel != dictionary['label.network.label.display.for.blank.value'])
array1.push("&vmwarenetworklabel=" + labels.vmwarenetworklabel); array1.push("&vmwarenetworklabel=" + labels.vmwarenetworklabel);
if(labels.ovmnetworklabel != dictionary['label.network.label.display.for.blank.value'])
array1.push("&ovmnetworklabel=" + labels.ovmnetworklabel);
$.ajax({ $.ajax({
url: createURL('updateTrafficType' + array1.join("")), url: createURL('updateTrafficType' + array1.join("")),
@ -392,7 +396,8 @@
{ {
xennetworklabel: { label: 'label.xen.traffic.label', isEditable: true }, xennetworklabel: { label: 'label.xen.traffic.label', isEditable: true },
kvmnetworklabel: { label: 'label.kvm.traffic.label', isEditable: true }, kvmnetworklabel: { label: 'label.kvm.traffic.label', isEditable: true },
vmwarenetworklabel: { label: 'label.vmware.traffic.label', isEditable: true } vmwarenetworklabel: { label: 'label.vmware.traffic.label', isEditable: true },
ovmnetworklabel: { label: 'label.ovm.traffic.label', isEditable: true }
} }
], ],
@ -411,6 +416,7 @@
selectedPublicNetworkObj.xennetworklabel = trafficType.xennetworklabel; selectedPublicNetworkObj.xennetworklabel = trafficType.xennetworklabel;
selectedPublicNetworkObj.kvmnetworklabel = trafficType.kvmnetworklabel; selectedPublicNetworkObj.kvmnetworklabel = trafficType.kvmnetworklabel;
selectedPublicNetworkObj.vmwarenetworklabel = trafficType.vmwarenetworklabel; selectedPublicNetworkObj.vmwarenetworklabel = trafficType.vmwarenetworklabel;
selectedPublicNetworkObj.ovmnetworklabel = trafficType.ovmnetworklabel;
args.response.success({data: selectedPublicNetworkObj}); args.response.success({data: selectedPublicNetworkObj});
} }
@ -563,7 +569,8 @@
{ {
xennetworklabel: { label: 'label.xen.traffic.label', isEditable: true }, xennetworklabel: { label: 'label.xen.traffic.label', isEditable: true },
kvmnetworklabel: { label: 'label.kvm.traffic.label', isEditable: true }, kvmnetworklabel: { label: 'label.kvm.traffic.label', isEditable: true },
vmwarenetworklabel: { label: 'label.vmware.traffic.label', isEditable: true } vmwarenetworklabel: { label: 'label.vmware.traffic.label', isEditable: true },
ovmnetworklabel: { label: 'label.ovm.traffic.label', isEditable: true }
} }
], ],
@ -580,6 +587,7 @@
selectedPublicNetworkObj.xennetworklabel = trafficType.xennetworklabel; selectedPublicNetworkObj.xennetworklabel = trafficType.xennetworklabel;
selectedPublicNetworkObj.kvmnetworklabel = trafficType.kvmnetworklabel; selectedPublicNetworkObj.kvmnetworklabel = trafficType.kvmnetworklabel;
selectedPublicNetworkObj.vmwarenetworklabel = trafficType.vmwarenetworklabel; selectedPublicNetworkObj.vmwarenetworklabel = trafficType.vmwarenetworklabel;
selectedPublicNetworkObj.ovmnetworklabel = trafficType.ovmnetworklabel;
args.response.success({data: selectedPublicNetworkObj}); args.response.success({data: selectedPublicNetworkObj});
} }
@ -720,7 +728,8 @@
{ {
xennetworklabel: { label: 'label.xen.traffic.label', isEditable: true }, xennetworklabel: { label: 'label.xen.traffic.label', isEditable: true },
kvmnetworklabel: { label: 'label.kvm.traffic.label', isEditable: true }, kvmnetworklabel: { label: 'label.kvm.traffic.label', isEditable: true },
vmwarenetworklabel: { label: 'label.vmware.traffic.label', isEditable: true } vmwarenetworklabel: { label: 'label.vmware.traffic.label', isEditable: true },
ovmnetworklabel: { label: 'label.ovm.traffic.label', isEditable: true }
} }
], ],
dataProvider: function(args) { dataProvider: function(args) {
@ -735,6 +744,7 @@
selectedManagementNetworkObj.xennetworklabel = trafficType.xennetworklabel; selectedManagementNetworkObj.xennetworklabel = trafficType.xennetworklabel;
selectedManagementNetworkObj.kvmnetworklabel = trafficType.kvmnetworklabel; selectedManagementNetworkObj.kvmnetworklabel = trafficType.kvmnetworklabel;
selectedManagementNetworkObj.vmwarenetworklabel = trafficType.vmwarenetworklabel; selectedManagementNetworkObj.vmwarenetworklabel = trafficType.vmwarenetworklabel;
selectedManagementNetworkObj.ovmnetworklabel = trafficType.ovmnetworklabel;
args.response.success({ data: selectedManagementNetworkObj }); args.response.success({ data: selectedManagementNetworkObj });
} }
@ -852,7 +862,8 @@
{ //updateTrafficType API { //updateTrafficType API
xennetworklabel: { label: 'label.xen.traffic.label', isEditable: true }, xennetworklabel: { label: 'label.xen.traffic.label', isEditable: true },
kvmnetworklabel: { label: 'label.kvm.traffic.label', isEditable: true }, kvmnetworklabel: { label: 'label.kvm.traffic.label', isEditable: true },
vmwarenetworklabel: { label: 'label.vmware.traffic.label', isEditable: true } vmwarenetworklabel: { label: 'label.vmware.traffic.label', isEditable: true },
ovmnetworklabel: { label: 'label.ovm.traffic.label', isEditable: true }
} }
], ],
dataProvider: function(args) { dataProvider: function(args) {
@ -878,6 +889,7 @@
selectedPhysicalNetworkObj["xennetworklabel"] = trafficType.xennetworklabel; selectedPhysicalNetworkObj["xennetworklabel"] = trafficType.xennetworklabel;
selectedPhysicalNetworkObj["kvmnetworklabel"] = trafficType.kvmnetworklabel; selectedPhysicalNetworkObj["kvmnetworklabel"] = trafficType.kvmnetworklabel;
selectedPhysicalNetworkObj["vmwarenetworklabel"] = trafficType.vmwarenetworklabel; selectedPhysicalNetworkObj["vmwarenetworklabel"] = trafficType.vmwarenetworklabel;
selectedPhysicalNetworkObj["ovmnetworklabel"] = trafficType.ovmnetworklabel;
args.response.success({ args.response.success({
actionFilter: function() { actionFilter: function() {