CS-16134: cloudstack 3.0 UI - autoscale - basic zone of elastic IP - Add Load 
Balancer tab - pass domainid and account to createLoadBalancerRule API since IP 
Address is not available. (Reviewed-by: Brian)


Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo
Commit: 
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/ccc23689
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/ccc23689
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/ccc23689

Branch: refs/heads/master
Commit: ccc2368969324b1863d7ded73acf202c071b3c6d
Parents: f35d2c2
Author: Jessica Wang <[email protected]>
Authored: Wed Aug 22 15:19:43 2012 -0700
Committer: Vijay Venkatachalam <[email protected]>
Committed: Fri Nov 16 10:56:55 2012 +0530

----------------------------------------------------------------------
 ui/scripts/autoscaler.js |   13 +++++++++++--
 1 files changed, 11 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/ccc23689/ui/scripts/autoscaler.js
----------------------------------------------------------------------
diff --git a/ui/scripts/autoscaler.js b/ui/scripts/autoscaler.js
index c459d06..2f72da1 100644
--- a/ui/scripts/autoscaler.js
+++ b/ui/scripts/autoscaler.js
@@ -1201,8 +1201,17 @@
             openfirewall: false,
             networkid: networkid
           };
-          if(args.context.ipAddresses != undefined)
-            data = $.extend(data, {publicipid: 
args.context.ipAddresses[0].id});
+          if(args.context.ipAddresses != null) {
+            data = $.extend(data, {
+                                                 publicipid: 
args.context.ipAddresses[0].id
+                                               });
+                                       }
+                                       else {
+                                         data = $.extend(data, {
+                                                 domainid: g_domainid,
+              account: g_account
+                                               });
+                                       }
 
           $.ajax({
             url: createURL('createLoadBalancerRule'),

Reply via email to