From 0f302f9e4249c19a75316190aa23610b2f17e3b6 Mon Sep 17 00:00:00 2001
From: Pranav Saxena <pranav.saxena@citrix.com>
Date: Thu, 2 Aug 2012 13:48:13 +0530
Subject: [PATCH] CS-15807 :No network label for OVM is available in UI

---
 ui/scripts/system.js | 28 +++++++++++++++++++---------
 1 file changed, 19 insertions(+), 9 deletions(-)

diff --git a/ui/scripts/system.js b/ui/scripts/system.js
index 38923f45c83..97595ee9279 100644
--- a/ui/scripts/system.js
+++ b/ui/scripts/system.js
@@ -115,7 +115,9 @@
 		  trafficType.kvmnetworklabel = dictionary['label.network.label.display.for.blank.value'];
 		if(trafficType.vmwarenetworklabel == null || trafficType.vmwarenetworklabel == 0)
 		  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;
   };
 
@@ -127,7 +129,8 @@
 		  array1.push("&kvmnetworklabel=" + labels.kvmnetworklabel);
 		if(labels.vmwarenetworklabel != dictionary['label.network.label.display.for.blank.value'])
 		  array1.push("&vmwarenetworklabel=" + labels.vmwarenetworklabel);
-				
+	         if(labels.ovmnetworklabel != dictionary['label.network.label.display.for.blank.value'])
+                  array1.push("&ovmnetworklabel=" + labels.ovmnetworklabel);			
 		$.ajax({
       url: createURL('updateTrafficType' + array1.join("")),
       data: {
@@ -404,7 +407,8 @@
                   {
                     xennetworklabel: { label: 'label.xen.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: 'OVM traffic label',isEditable:true}
                   }
                 ],
 
@@ -423,6 +427,7 @@
                       selectedPublicNetworkObj.xennetworklabel = trafficType.xennetworklabel;
                       selectedPublicNetworkObj.kvmnetworklabel = trafficType.kvmnetworklabel;
                       selectedPublicNetworkObj.vmwarenetworklabel = trafficType.vmwarenetworklabel;
+                      selectedPublicNetworkObj.ovmnetworklabel = trafficType.ovmnetworklabel;
 
                       args.response.success({data: selectedPublicNetworkObj});
                     }
@@ -575,7 +580,9 @@
                   {
                     xennetworklabel: { label: 'label.xen.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: 'OVM traffic label', isEditable: true }
+
                   }
                 ],
 
@@ -592,7 +599,7 @@
                       selectedPublicNetworkObj.xennetworklabel = trafficType.xennetworklabel;
                       selectedPublicNetworkObj.kvmnetworklabel = trafficType.kvmnetworklabel;
                       selectedPublicNetworkObj.vmwarenetworklabel = trafficType.vmwarenetworklabel;
-
+                       selectedPublicNetworkObj.ovmnetworklabel = trafficType.ovmnetworklabel;
                       args.response.success({data: selectedPublicNetworkObj});
                     }
                   });
@@ -732,7 +739,9 @@
                   {
                     xennetworklabel: { label: 'label.xen.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: 'OVM traffic label', isEditable: true }
+
                   }
                 ],
                 dataProvider: function(args) {
@@ -747,7 +756,7 @@
                       selectedManagementNetworkObj.xennetworklabel = trafficType.xennetworklabel;
                       selectedManagementNetworkObj.kvmnetworklabel = trafficType.kvmnetworklabel;
                       selectedManagementNetworkObj.vmwarenetworklabel = trafficType.vmwarenetworklabel;
-
+                      selectedManagementNetworkObj.ovmnetworklabel = trafficType.ovmnetworklabel;
                       args.response.success({ data: selectedManagementNetworkObj });
                     }
                   });
@@ -864,7 +873,8 @@
                   { //updateTrafficType API
                     xennetworklabel: { label: 'label.xen.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: 'OVM traffic label', isEditable: true }
                   }
                 ],
                 dataProvider: function(args) { //physical network + Guest traffic type       
@@ -899,7 +909,7 @@
 											selectedPhysicalNetworkObj["xennetworklabel"] = trafficType.xennetworklabel;
 											selectedPhysicalNetworkObj["kvmnetworklabel"] = trafficType.kvmnetworklabel;
 											selectedPhysicalNetworkObj["vmwarenetworklabel"] = trafficType.vmwarenetworklabel;
-
+                                                                                        selectedPhysicalNetworkObj["ovmnetworklabel"] = trafficType.ovmnetworklabel;
 											args.response.success({
 												actionFilter: function() {
 													var allowedActions = ['edit'];