From c8ea8710ecea0427b4dec651b605ce89227da06a Mon Sep 17 00:00:00 2001
From: Hari <haripk@juniper.net>
Date: Thu, 25 Feb 2016 16:13:38 +0530
Subject: [PATCH] Do not set service-instance-ip as primary address on an
 interface.

Change-Id: Ie53026bc1d33a042cd5c71c860ba332f218332be
closes-bug: 1548942
---
 src/vnsw/agent/oper/vm_interface.cc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/vnsw/agent/oper/vm_interface.cc b/src/vnsw/agent/oper/vm_interface.cc
index cd7ece47bd0..2e3685df8f1 100644
--- a/src/vnsw/agent/oper/vm_interface.cc
+++ b/src/vnsw/agent/oper/vm_interface.cc
@@ -426,7 +426,7 @@ static void BuildInstanceIp(Agent *agent, VmInterfaceConfigData *data,
     IpAddress addr = IpAddress::from_string(ip->address(), err);
     bool is_primary = false;
 
-    if (ip->secondary() != true) {
+    if (ip->secondary() != true && ip->service_instance_ip() != true) {
         is_primary = true;
         if (addr.is_v4()) {
             if (addr == Ip4Address(0)) {