From 4164a6f165970518e7571b73ca91c32a47620aae Mon Sep 17 00:00:00 2001
From: Jessica Wang <jessica@cloud.com>
Date: Mon, 9 Apr 2012 15:28:58 -0700
Subject: [PATCH] cloudstack 3.0 UI - physical network page - guest traffic
 type - implement Refresh button.

---
 ui/scripts/system.js | 70 +++++++++++++++++++++++++-------------------
 1 file changed, 40 insertions(+), 30 deletions(-)

diff --git a/ui/scripts/system.js b/ui/scripts/system.js
index f4faa7000c6..803a9051ae1 100644
--- a/ui/scripts/system.js
+++ b/ui/scripts/system.js
@@ -867,38 +867,48 @@
                     vmwarenetworklabel: { label: 'label.vmware.traffic.label', isEditable: true }
                   }
                 ],
-                dataProvider: function(args) {
-                  //physical network
-									var startVlan, endVlan;
-                  var vlan = selectedPhysicalNetworkObj.vlan;
-                  if(vlan != null && vlan.length > 0) {
-                    if(vlan.indexOf("-") != -1) {
-                      var vlanArray = vlan.split("-");
-                      startVlan = vlanArray[0];
-                      endVlan = vlanArray[1];
-                    }
-                    else {
-                      startVlan = vlan;
-                    }
-                    selectedPhysicalNetworkObj["startVlan"] = startVlan;
-                    selectedPhysicalNetworkObj["endVlan"] = endVlan;
-                  }
+                dataProvider: function(args) { //physical network + Guest traffic type       
+									//refresh physical network									
+									$.ajax({
+										url: createURL('listPhysicalNetworks'),
+										data: {
+											id: args.context.physicalNetworks[0].id
+										},
+										async: true,
+										success: function(json) {										  
+											selectedPhysicalNetworkObj = json.listphysicalnetworksresponse.physicalnetwork[0];			
+											
+											var startVlan, endVlan;
+											var vlan = selectedPhysicalNetworkObj.vlan;
+											if(vlan != null && vlan.length > 0) {
+												if(vlan.indexOf("-") != -1) {
+													var vlanArray = vlan.split("-");
+													startVlan = vlanArray[0];
+													endVlan = vlanArray[1];
+												}
+												else {
+													startVlan = vlan;
+												}
+												selectedPhysicalNetworkObj["startVlan"] = startVlan;
+												selectedPhysicalNetworkObj["endVlan"] = endVlan;
+											}
 
-									//traffic type
-									var xentrafficlabel, kvmtrafficlabel, vmwaretrafficlabel;
-                  var trafficType = getTrafficType(selectedPhysicalNetworkObj, 'Guest');
-									selectedPhysicalNetworkObj["xennetworklabel"] = trafficType.xennetworklabel;
-									selectedPhysicalNetworkObj["kvmnetworklabel"] = trafficType.kvmnetworklabel;
-									selectedPhysicalNetworkObj["vmwarenetworklabel"] = trafficType.vmwarenetworklabel;
+											//traffic type
+											var xentrafficlabel, kvmtrafficlabel, vmwaretrafficlabel;
+											var trafficType = getTrafficType(selectedPhysicalNetworkObj, 'Guest'); //refresh Guest traffic type
+											selectedPhysicalNetworkObj["xennetworklabel"] = trafficType.xennetworklabel;
+											selectedPhysicalNetworkObj["kvmnetworklabel"] = trafficType.kvmnetworklabel;
+											selectedPhysicalNetworkObj["vmwarenetworklabel"] = trafficType.vmwarenetworklabel;
 
-                  args.response.success({
-                    actionFilter: function() {
-                      var allowedActions = ['edit'];
-
-                      return allowedActions;
-                    },
-                    data: selectedPhysicalNetworkObj
-                  });
+											args.response.success({
+												actionFilter: function() {
+													var allowedActions = ['edit'];
+													return allowedActions;
+												},
+												data: selectedPhysicalNetworkObj
+											});											
+										}
+									});	
                 }
               },