From d3df539bcdc840debf2cec8e71ef43d9918a6627 Mon Sep 17 00:00:00 2001
From: Nischal Sheth <nsheth@juniper.net>
Date: Wed, 16 Mar 2016 17:12:13 -0700
Subject: [PATCH] BGPaaSv2: Schema change to suppress route advertisement

Change-Id: I25c6bac0a3c5c6dc1d94084734a85e53de76904c
Partial-Bug: 1552952
---
 src/bgp/bgp_ribout.cc  |  7 ++++++-
 src/schema/vnc_cfg.xsd | 10 ++++++++++
 2 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/src/bgp/bgp_ribout.cc b/src/bgp/bgp_ribout.cc
index a9b50412e8d..fa2fb06951e 100644
--- a/src/bgp/bgp_ribout.cc
+++ b/src/bgp/bgp_ribout.cc
@@ -241,7 +241,12 @@ RibOut::RibOut(BgpTable *table, SchedulingGroupManager *mgr,
         name_ += " Type: IBGP";
     } else {
         name_ += " Type: EBGP";
-        name_ += " (AS " + integerToString(policy_.as_number) + ")";
+        name_ += " (AS " + integerToString(policy_.as_number);
+        if (!policy_.nexthop.is_unspecified())
+            name_ += " Nexthop " + policy_.nexthop.to_string();
+        if (policy_.as_override)
+            name_ += " ASOverride";
+        name_ += ")";
     }
 }
 
diff --git a/src/schema/vnc_cfg.xsd b/src/schema/vnc_cfg.xsd
index 58bf9167c9d..b3d95b85137 100644
--- a/src/schema/vnc_cfg.xsd
+++ b/src/schema/vnc_cfg.xsd
@@ -1424,6 +1424,16 @@ targetNamespace="http://www.contrailsystems.com/2012/VNC-CONFIG/0">
     </xsd:annotation>
 <!--#IFMAP-SEMANTICS-IDL
      Property('bgpaas-ipv4-mapped-ipv6-nexthop', 'bgp-as-a-service') -->
+<xsd:element name='bgpaas-suppress-route-advertisement' type='xsd:boolean'/>
+    <xsd:annotation>
+        <xsd:documentation>
+            This is used to indicate that the server should not advertise any
+            routes to the client i.e. the client has static routes (typically
+            a default) configured.
+        </xsd:documentation>
+    </xsd:annotation>
+<!--#IFMAP-SEMANTICS-IDL
+     Property('bgpaas-suppress-route-advertisement', 'bgp-as-a-service') -->
 
 <xsd:element name="virtual-router" type="ifmap:IdentityType"/>
 <xsd:element name="global-system-config-virtual-router"/>