From b80a71ccb99681d5365d56be02f226a5d1dac892 Mon Sep 17 00:00:00 2001 From: Jessica Wang Date: Tue, 8 Apr 2014 14:04:30 -0700 Subject: [PATCH] CLOUDSTACK-6342: UI - Load Balancing page - LB rules - VM + IP Address - remove action - pass vmidipmap instead of virtualmachineids to removeFromLoadBalancerRule API where IP Address is specified for this VM under this LB rule. --- ui/scripts/network.js | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/ui/scripts/network.js b/ui/scripts/network.js index 0bf5d912a9d..660838ba3ea 100755 --- a/ui/scripts/network.js +++ b/ui/scripts/network.js @@ -3766,7 +3766,21 @@ }, destroy: { label: 'label.remove.vm.from.lb', - action: function(args) { + action: function(args) { + var inputData; + if (args.item.itemIp == undefined) { + inputData = { + id: args.multiRule.id, + virtualmachineids: args.item.id + }; + } else { + inputData = { + id: args.multiRule.id, + "vmidipmap[0].vmid": args.item.id, + "vmidipmap[0].vmip": args.item.itemIp + }; + } + $.ajax({ url: createURL('removeFromLoadBalancerRule'), data: {