Merge "Do not set service-instance-ip as primary address on an interf…

…ace."
Juniper · Feb 25, 2016 · 03d0bcb · 03d0bcb
2 parents 59d4181 + a4c86c3
commit 03d0bcb
Showing 1 changed file with 1 addition and 1 deletion.
diff --git 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)) {