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

CLOUDSTACK-8190: Fix xenserver traffic label for backward compatiblity 

Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
This commit is contained in:
Rohit Yadav 2015-02-02 16:09:56 +05:30
parent 64e938b701
commit 48ec9ac11b
3 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
api/src/org/apache/cloudstack/api/ApiConstants.java
View File

@ -380,7 +380,7 @@ public class ApiConstants {
public static final String SECURITY_GROUP_EANBLED = "securitygroupenabled";
public static final String LOCAL_STORAGE_ENABLED = "localstorageenabled";
public static final String GUEST_IP_TYPE = "guestiptype";
public static final String XENSERVER_NETWORK_LABEL = "xenservernetworklabel";
public static final String XENSERVER_NETWORK_LABEL = "xennetworklabel";
public static final String KVM_NETWORK_LABEL = "kvmnetworklabel";
public static final String VMWARE_NETWORK_LABEL = "vmwarenetworklabel";
public static final String HYPERV_NETWORK_LABEL = "hypervnetworklabel";

24
ui/scripts/system.js
View File

@ -127,8 +127,8 @@
}
});
if (trafficType.xenservernetworklabel == null || trafficType.xenservernetworklabel == 0)
trafficType.xenservernetworklabel = dictionary[ 'label.network.label.display.for.blank.value'];
if (trafficType.xennetworklabel == null || trafficType.xennetworklabel == 0)
trafficType.xennetworklabel = dictionary[ 'label.network.label.display.for.blank.value'];
if (trafficType.kvmnetworklabel == null || trafficType.kvmnetworklabel == 0)
trafficType.kvmnetworklabel = dictionary[ 'label.network.label.display.for.blank.value'];
if (trafficType.vmwarenetworklabel == null || trafficType.vmwarenetworklabel == 0)
@ -145,8 +145,8 @@
var updateTrafficLabels = function (trafficType, labels, complete) {
var array1 =[];
if (labels.xenservernetworklabel != dictionary[ 'label.network.label.display.for.blank.value'])
array1.push("&xenservernetworklabel=" + labels.xenservernetworklabel);
if (labels.xennetworklabel != dictionary[ 'label.network.label.display.for.blank.value'])
array1.push("&xennetworklabel=" + labels.xennetworklabel);
if (labels.kvmnetworklabel != dictionary[ 'label.network.label.display.for.blank.value'])
array1.push("&kvmnetworklabel=" + labels.kvmnetworklabel);
if (labels.vmwarenetworklabel != dictionary[ 'label.network.label.display.for.blank.value'])
@ -573,7 +573,7 @@
}
},
{
xenservernetworklabel: {
xennetworklabel: {
label: 'label.xenserver.traffic.label',
isEditable: true
},
@ -613,7 +613,7 @@
selectedPublicNetworkObj = items[0];
// Include traffic labels
selectedPublicNetworkObj.xenservernetworklabel = trafficType.xenservernetworklabel;
selectedPublicNetworkObj.xennetworklabel = trafficType.xennetworklabel;
selectedPublicNetworkObj.kvmnetworklabel = trafficType.kvmnetworklabel;
selectedPublicNetworkObj.vmwarenetworklabel = trafficType.vmwarenetworklabel;
selectedPublicNetworkObj.ovmnetworklabel = trafficType.ovmnetworklabel;
@ -883,7 +883,7 @@
}
},
{
xenservernetworklabel: {
xennetworklabel: {
label: 'label.xenserver.traffic.label',
isEditable: true
},
@ -919,7 +919,7 @@
var trafficType = getTrafficType(selectedPhysicalNetworkObj, 'Storage');
selectedPublicNetworkObj = items[0];
selectedPublicNetworkObj.xenservernetworklabel = trafficType.xenservernetworklabel;
selectedPublicNetworkObj.xennetworklabel = trafficType.xennetworklabel;
selectedPublicNetworkObj.kvmnetworklabel = trafficType.kvmnetworklabel;
selectedPublicNetworkObj.vmwarenetworklabel = trafficType.vmwarenetworklabel;
selectedPublicNetworkObj.ovmnetworklabel = trafficType.ovmnetworklabel;
@ -1095,7 +1095,7 @@
}
},
{
xenservernetworklabel: {
xennetworklabel: {
label: 'label.xenserver.traffic.label',
isEditable: true
},
@ -1129,7 +1129,7 @@
var trafficType = getTrafficType(selectedPhysicalNetworkObj, 'Management');
selectedManagementNetworkObj.xenservernetworklabel = trafficType.xenservernetworklabel;
selectedManagementNetworkObj.xennetworklabel = trafficType.xennetworklabel;
selectedManagementNetworkObj.kvmnetworklabel = trafficType.kvmnetworklabel;
selectedManagementNetworkObj.vmwarenetworklabel = trafficType.vmwarenetworklabel;
selectedManagementNetworkObj.ovmnetworklabel = trafficType.ovmnetworklabel;
@ -1284,7 +1284,7 @@
},
{
//updateTrafficType API
xenservernetworklabel: {
xennetworklabel: {
label: 'label.xenserver.traffic.label',
isEditable: true
},
@ -1340,7 +1340,7 @@
var xenservertrafficlabel, kvmtrafficlabel, vmwaretrafficlabel;
var trafficType = getTrafficType(selectedPhysicalNetworkObj, 'Guest');
//refresh Guest traffic type
selectedPhysicalNetworkObj[ "xenservernetworklabel"] = trafficType.xenservernetworklabel;
selectedPhysicalNetworkObj[ "xennetworklabel"] = trafficType.xennetworklabel;
selectedPhysicalNetworkObj[ "kvmnetworklabel"] = trafficType.kvmnetworklabel;
selectedPhysicalNetworkObj[ "vmwarenetworklabel"] = trafficType.vmwarenetworklabel;
selectedPhysicalNetworkObj[ "ovmnetworklabel"] = trafficType.ovmnetworklabel;

2
ui/scripts/zoneWizard.js
View File

@ -71,7 +71,7 @@
switch (hypervisor) {
case 'XenServer':
hypervisorAttr = 'xenservernetworklabel';
hypervisorAttr = 'xennetworklabel';
break;
case 'KVM':
hypervisorAttr = 'kvmnetworklabel';