From 26904d1a2b0d2faf29e8110072263ccccbe3d640 Mon Sep 17 00:00:00 2001
From: Brian Federle <brian.federle@citrix.com>
Date: Tue, 26 Aug 2014 14:38:55 -0700
Subject: [PATCH] CLOUDSTACK-5952: Add 'VM IP Address' field to IP detail view

---
 client/WEB-INF/classes/resources/messages.properties | 1 +
 ui/dictionary.jsp                                    | 1 +
 ui/scripts/network.js                                | 3 +++
 3 files changed, 5 insertions(+)

diff --git a/client/WEB-INF/classes/resources/messages.properties b/client/WEB-INF/classes/resources/messages.properties
index 475fe6c95f1..65a44a63fa8 100644
--- a/client/WEB-INF/classes/resources/messages.properties
+++ b/client/WEB-INF/classes/resources/messages.properties
@@ -14,6 +14,7 @@
 # KIND, either express or implied.  See the License for the
 # specific language governing permissions and limitations
 # under the License.
+label.vm.ip=VM IP Address
 message.listView.subselect.multi=(Ctrl/Cmd-click)
 label.use.vm.ips=Use VM IPs
 label.reinstall.vm=Reinstall VM
diff --git a/ui/dictionary.jsp b/ui/dictionary.jsp
index 3b85b1f7320..0102144c9e1 100644
--- a/ui/dictionary.jsp
+++ b/ui/dictionary.jsp
@@ -25,6 +25,7 @@ under the License.
 <% long now = System.currentTimeMillis(); %>
 <script type="text/javascript">
 dictionary = {
+'label.vm.ip': '<fmt:message key="label.vm.ip" />',
 'message.listView.subselect.multi': '<fmt:message key="message.listView.subselect.multi" />',
 'label.use.vm.ips': '<fmt:message key="label.use.vm.ips" />',
 'label.recover.vm': '<fmt:message key="label.recover.vm" />',
diff --git a/ui/scripts/network.js b/ui/scripts/network.js
index 118b5d875af..8a758c88fdb 100755
--- a/ui/scripts/network.js
+++ b/ui/scripts/network.js
@@ -2785,6 +2785,9 @@
                                         label: 'label.static.nat',
                                         converter: cloudStack.converters.toBooleanText
                                     },
+                                    vmipaddress: {
+                                        label: 'label.vm.ip'
+                                    },
                                     issystem: {
                                         label: 'label.is.system',
                                         converter: cloudStack.converters.toBooleanText