From d01bbb9417a5978b19166694113fc4a43778ec23 Mon Sep 17 00:00:00 2001
From: Brian Federle <brian.federle@citrix.com>
Date: Mon, 22 Oct 2012 17:20:06 -0700
Subject: [PATCH] Apply same dataProvider map to both ingress and egress rules

-Because the dataProvider for both ingress and egress rules are
 handled the same, use a shared data mapping for both
---
 ui/scripts/network.js | 49 +++++++++++++++++++------------------------
 1 file changed, 21 insertions(+), 28 deletions(-)

diff --git a/ui/scripts/network.js b/ui/scripts/network.js
index f1d46ed06c8..66e9cfc0584 100644
--- a/ui/scripts/network.js
+++ b/ui/scripts/network.js
@@ -16,6 +16,25 @@
 // under the License.
 
 (function(cloudStack, $) {
+  var ingressEgressDataMap = function(elem) {
+    var elemData = {
+      id: elem.ruleid,
+      protocol: elem.protocol,
+      startport: elem.startport,
+      endport: elem.endport,
+      cidr: elem.cidr ? elem.cidr : ''.concat(elem.account, ' - ', elem.securitygroupname)
+    };
+
+    if (elemData.startport == 0 && elemData.endport) {
+      elemData.startport = '0';
+    } else if (elem.icmptype && elem.icmpcode) {
+      elemData.startport = elem.icmptype;
+      elemData.endport = elem.icmpcode;
+    }
+
+    return elemData;
+  };
+  
   var ipChangeNotice = function() {
     cloudStack.dialog.confirm({
       message: 'message.ip.address.changed',
@@ -3470,15 +3489,7 @@
                           data: $.map(
                             data.listsecuritygroupsresponse.securitygroup[0].ingressrule ? 
                               data.listsecuritygroupsresponse.securitygroup[0].ingressrule : [],
-                            function(elem) {
-                              return {
-                                id: elem.ruleid,
-                                protocol: elem.protocol,
-                                startport: elem.startport ? elem.startport : elem.icmptype,
-                                endport: elem.endport ? elem.endport : elem.icmpcode,
-                                cidr: elem.cidr ? elem.cidr : ''.concat(elem.account, ' - ', elem.securitygroupname)
-                              };
-                            }
+                            ingressEgressDataMap
                           )
                         });
                       }
@@ -3647,25 +3658,7 @@
                           data: $.map(
                             data.listsecuritygroupsresponse.securitygroup[0].egressrule ? 
                               data.listsecuritygroupsresponse.securitygroup[0].egressrule : [],
-                            
-                            function(elem) {
-                              var elemData = {
-                                id: elem.ruleid,
-                                protocol: elem.protocol,
-                                startport: elem.startport,
-                                endport: elem.endport,
-                                cidr: elem.cidr ? elem.cidr : ''.concat(elem.account, ' - ', elem.securitygroupname)
-                              };
-
-                              if (elemData.startport == 0 && elemData.endport) {
-                                elemData.startport = '0';
-                              } else if (elem.icmptype && elem.icmpcode) {
-                                elemData.startport = elem.icmptype;
-                                elemData.endport = elem.icmpcode;
-                              }
-
-                              return elemData;
-                            }
+                            ingressEgressDataMap
                           )
                         });
                       }