cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bhais...@apache.org
Subject git commit: updated refs/heads/master to 2f6691c
Date Mon, 02 Feb 2015 10:51:10 GMT
Repository: cloudstack
Updated Branches:
  refs/heads/master fc6d925ad -> 2f6691c6b


CLOUDSTACK-8190: Fix xenserver traffic label for backward compatiblity

(cherry picked from commit 48ec9ac11b0772ffb9b7be4947f26aba0ad9b89d)
Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>

Conflicts:
	ui/scripts/system.js


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/2f6691c6
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/2f6691c6
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/2f6691c6

Branch: refs/heads/master
Commit: 2f6691c6b942e9e3b1567145006ee33d497c5fc4
Parents: fc6d925
Author: Rohit Yadav <rohit.yadav@shapeblue.com>
Authored: Mon Feb 2 16:09:56 2015 +0530
Committer: Rohit Yadav <rohit.yadav@shapeblue.com>
Committed: Mon Feb 2 16:20:50 2015 +0530

----------------------------------------------------------------------
 .../org/apache/cloudstack/api/ApiConstants.java |  2 +-
 ui/scripts/system.js                            | 24 ++++++++++----------
 ui/scripts/zoneWizard.js                        |  2 +-
 3 files changed, 14 insertions(+), 14 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/2f6691c6/api/src/org/apache/cloudstack/api/ApiConstants.java
----------------------------------------------------------------------
diff --git a/api/src/org/apache/cloudstack/api/ApiConstants.java b/api/src/org/apache/cloudstack/api/ApiConstants.java
index 6bd5dde..b6aed6f 100644
--- a/api/src/org/apache/cloudstack/api/ApiConstants.java
+++ b/api/src/org/apache/cloudstack/api/ApiConstants.java
@@ -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";

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/2f6691c6/ui/scripts/system.js
----------------------------------------------------------------------
diff --git a/ui/scripts/system.js b/ui/scripts/system.js
index 88d0a78..eb90599 100644
--- a/ui/scripts/system.js
+++ b/ui/scripts/system.js
@@ -127,8 +127,8 @@
             }
         });
         
-        if (trafficType.xenservernetworklabel == null || trafficType.xenservernetworklabel
== 0)
-        trafficType.xenservernetworklabel = _l( 'label.network.label.display.for.blank.value');
+        if (trafficType.xennetworklabel == null || trafficType.xennetworklabel == 0)
+        trafficType.xennetworklabel = _l( 'label.network.label.display.for.blank.value');
         if (trafficType.kvmnetworklabel == null || trafficType.kvmnetworklabel == 0)
         trafficType.kvmnetworklabel = _l( '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 != _l( 'label.network.label.display.for.blank.value'))
-        array1.push("&xenservernetworklabel=" + labels.xenservernetworklabel);
+        if (labels.xennetworklabel != _l( 'label.network.label.display.for.blank.value'))
+        array1.push("&xennetworklabel=" + labels.xennetworklabel);
         if (labels.kvmnetworklabel != _l( 'label.network.label.display.for.blank.value'))
         array1.push("&kvmnetworklabel=" + labels.kvmnetworklabel);
         if (labels.vmwarenetworklabel != _l( '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;

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/2f6691c6/ui/scripts/zoneWizard.js
----------------------------------------------------------------------
diff --git a/ui/scripts/zoneWizard.js b/ui/scripts/zoneWizard.js
index d42b44e..13bc3ab 100755
--- a/ui/scripts/zoneWizard.js
+++ b/ui/scripts/zoneWizard.js
@@ -71,7 +71,7 @@
 
         switch (hypervisor) {
             case 'XenServer':
-                hypervisorAttr = 'xenservernetworklabel';
+                hypervisorAttr = 'xennetworklabel';
                 break;
             case 'KVM':
                 hypervisorAttr = 'kvmnetworklabel';


Mime
View raw message