You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by bf...@apache.org on 2014/05/02 00:41:05 UTC

[3/3] git commit: updated refs/heads/master to 4f45c97

CLOUDSTACK-6438: WIP: If VM has additional IPs, keep showing in add screen


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

Branch: refs/heads/master
Commit: 1ad532f57eee8358d74866e577669e2394d97c7d
Parents: 3962577
Author: Brian Federle <br...@citrix.com>
Authored: Thu May 1 13:13:28 2014 -0700
Committer: Brian Federle <br...@citrix.com>
Committed: Thu May 1 15:40:47 2014 -0700

----------------------------------------------------------------------
 ui/scripts/network.js | 22 ++++++++++++++++++++++
 1 file changed, 22 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/1ad532f5/ui/scripts/network.js
----------------------------------------------------------------------
diff --git a/ui/scripts/network.js b/ui/scripts/network.js
index f0141b6..10d5a05 100755
--- a/ui/scripts/network.js
+++ b/ui/scripts/network.js
@@ -3380,6 +3380,28 @@
                                                                         return item.id == instance.id;
                                                                     }).length;
 
+                                                                    // Check if there are any remaining IPs
+                                                                    if (!notExisting) {
+                                                                        $.ajax({
+                                                                            url: createURL('listNics'),
+                                                                            async: false,
+                                                                            data: {
+                                                                                virtualmachineid: instance.id
+                                                                            },
+                                                                            success: function(json) {
+                                                                                var nics = json.listnicsresponse.nic;
+
+                                                                                $(nics).map(function (index, nic) {
+                                                                                    if (nic.secondaryip) {
+                                                                                        notExisting = true;
+
+                                                                                        return false;
+                                                                                    }
+                                                                                });
+                                                                            }
+                                                                        })
+                                                                    }
+
                                                                     return nonAutoScale && isActiveState && notExisting;
                                                                 }
                                                             );