Merge pull request #60 from asbalaji/master

Floating IP changes wrt change in schema. Earlier FIP used to have VMI a...
Added erm-vpn adddress family to the control node type in BGP peer page and in monitor routes page
Merge pull request #61 from sbavanasi/ERM-VPN

Added erm-vpn adddress family to the control node type in BGP peer page ...

Add UT cases performed.
Fixed Bug ID 2611,1325489
FIP(Bug ID 2611)
FIP Name changed in the grid from Floating IP and Pool to Floating IP Pool.
FIP create window got expanded.
Menu name changed to "Manage Floating IPs"
Policy
Removed the single service check in Policy create window when Apply Service is
enabled.
Service Instance(bug id 1325489)
Added Verification if there is no template.
Merge pull request #66 from balamurugang/R1.1

Fixed : Bug ID 2611,1325489
Please update the unit test cases executed.
Re-factoring the tooltip function for scatter chart.
 Earlier, there is a seperate function for handling overlapped tooltip. Merged with the common changes
Merge pull request #67 from vishnuvv/BugFixes

Re-factoring the tooltip function for scatter chart.
Removed policey rule validation for
Only 'ANY' protocol allowed while applying services
Only 'ANY' source port allowed while applying services.
Only 'ANY' destination port allowed while applying services.

when TCP is selected.
Merge pull request #72 from balamurugang/R1.1

Removed policey rule validation for
Added the floating IP details in row details of instance summary page and traffic in and out in the floating Ip column
Merge pull request #73 from vishnuvv/FIP

Added the floating IP details in row details of instance summary page an...
Revert "Merge pull request #73 from vishnuvv/FIP"
Reverting from mainline as floating ip stats in instance UVE are only checked-in to R1.06

This reverts commit c95d0cbe9890650848fd87ee93ab9480ef9aa695, reversing
changes made to bfc601111710870003d2ddac1e595e203dd55149.
Merge pull request #77 from nagakiran/revertFipCheckIn

Revert "Merge pull request #73 from vishnuvv/FIP"
Fixed the icon spining in the grid for FIP,BGP,Service Template..
Merge pull request #79 from balamurugang/R1.1

Fixed the icon spining in the grid for FIP,BGP,Service Template..
Syntax error on if condition