From 46cf840e25fe661f0b8e6f37271e59d88a3e9025 Mon Sep 17 00:00:00 2001
From: Spencer Gibb <spencer@gibb.us>
Date: Wed, 8 Oct 2014 16:54:40 -0600
Subject: [PATCH] added ipAddress to ServiceInstance

---
 .../org/springframework/cloud/client/ServiceInstance.java    | 1 +
 .../springframework/cloud/netflix/EurekaDiscoverClient.java  | 5 +++++
 .../cloud/netflix/ribbon/RibbonLoadBalancerClient.java       | 5 +++++
 3 files changed, 11 insertions(+)

diff --git a/spring-cloud-netflix-core/src/main/java/org/springframework/cloud/client/ServiceInstance.java b/spring-cloud-netflix-core/src/main/java/org/springframework/cloud/client/ServiceInstance.java
index 2480f2a3..62b8cdfa 100644
--- a/spring-cloud-netflix-core/src/main/java/org/springframework/cloud/client/ServiceInstance.java
+++ b/spring-cloud-netflix-core/src/main/java/org/springframework/cloud/client/ServiceInstance.java
@@ -8,5 +8,6 @@ package org.springframework.cloud.client;
 public interface ServiceInstance {
     public String getServiceId();
     public String getHost();
+    public String getIpAddress();
     public int getPort();
 }
diff --git a/spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/EurekaDiscoverClient.java b/spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/EurekaDiscoverClient.java
index 9ba8f89f..5f17c55e 100644
--- a/spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/EurekaDiscoverClient.java
+++ b/spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/EurekaDiscoverClient.java
@@ -26,6 +26,11 @@ public class EurekaDiscoverClient implements DiscoveryClient {
                 return config.getHostname();
             }
 
+            @Override
+            public String getIpAddress() {
+                return config.getIpAddress();
+            }
+
             @Override
             public int getPort() {
                 return config.getNonSecurePort();
diff --git a/spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/ribbon/RibbonLoadBalancerClient.java b/spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/ribbon/RibbonLoadBalancerClient.java
index 577ad7f4..7b6542e8 100644
--- a/spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/ribbon/RibbonLoadBalancerClient.java
+++ b/spring-cloud-netflix-core/src/main/java/org/springframework/cloud/netflix/ribbon/RibbonLoadBalancerClient.java
@@ -44,6 +44,11 @@ public class RibbonLoadBalancerClient implements LoadBalancerClient {
             return server.getHost();
         }
 
+        @Override
+        public String getIpAddress() {
+            return null; //TODO: ribbon doesn't supply ip
+        }
+
         @Override
         public int getPort() {
             return server.getPort();