Merge "Closes-Bug: #1549790 Show all interfaces of all types in vRout…

…er details page (Interfaces tab) Currently, we are showing only vport/logical-port/remote-physical-port interfaces, but it has an issue that record count not shown correctly in some cases. As the record count that we get from introspect is for all interface types, and we filter these 3 interface types in UI."
Juniper · Mar 21, 2016 · 2238bd2 · 2238bd2
2 parents 85ec5b5 + 137c29b
commit 2238bd2
Showing 1 changed file with 17 additions and 7 deletions.
diff --git a/webroot/monitor/infrastructure/common/ui/js/utils/monitor.infra.parsers.js b/webroot/monitor/infrastructure/common/ui/js/utils/monitor.infra.parsers.js
@@ -987,19 +987,29 @@ define(
                                     }
                                 }
                             }
-                            if(new RegExp(/vport|logical-port|remote-physical-port/).test(obj['type'])) {
+                            // if(new RegExp(/vport|logical-port|remote-physical-port/).test(obj['type'])) {
                                 if(obj.fip_list != null) {
                                     var fipList = [];
                                     fipList = ifNull(jsonPath(obj,"$..FloatingIpSandeshList")[0],[]);
                                     obj['disp_fip_list'] = self.floatingIPCellTemplate(fipList);
                                 }
-                                retArray.push({uuid:obj['uuid'],name:obj['name'],label:obj['label'],active:obj['active'],
+                                retArray.push({
+                                    uuid: obj['uuid'],
+                                    name: obj['name'],
+                                    label: obj['label'],
+                                    active: obj['active'],
                                     dispName: obj['dispName'],
-                                    type:obj['type'],
-                                    vn_name:obj['vn_name'],disp_vn_name:dispVNName,vm_uuid:obj['vm_uuid'],
-                                    vm_name:obj['vm_name'],disp_vm_name:dispVMName,ip_addr:obj['ip_addr'],
-                                    disp_fip_list:obj['disp_fip_list'],raw_json:rawJson});
-                            }
+                                    type: obj['type'],
+                                    vn_name: obj['vn_name'],
+                                    disp_vn_name: dispVNName,
+                                    vm_uuid: obj['vm_uuid'],
+                                    vm_name: obj['vm_name'],
+                                    disp_vm_name: dispVMName,
+                                    ip_addr: obj['ip_addr'],
+                                    disp_fip_list: obj['disp_fip_list'],
+                                    raw_json: rawJson
+                                });
+                            // }
                         });
                     }
                     return {