Skip to content

Commit

Permalink
Merge "Schema changes to route aggregation and routing policy"
Browse files Browse the repository at this point in the history
  • Loading branch information
Zuul authored and opencontrail-ci-admin committed Nov 25, 2015
2 parents 0534b51 + 0337efb commit c563fef
Show file tree
Hide file tree
Showing 2 changed files with 26 additions and 0 deletions.
16 changes: 16 additions & 0 deletions src/schema/bgp_schema.xsd
Expand Up @@ -21,6 +21,22 @@
<!--#IFMAP-SEMANTICS-IDL
Link('instance-target', 'routing-instance', 'route-target', ['ref']) -->

<xsd:element name="route-aggregate" type="ifmap:IdentityType"/>

<xsd:complexType name='AggregateRouteType'>
<xsd:element name='prefix' type='xsd:string'/>
<xsd:element name='nexthop' type='xsd:string'/>
</xsd:complexType>

<xsd:element name='aggregate-route' type='AggregateRouteType'/>
<!--#IFMAP-SEMANTICS-IDL
Property('aggregate-route', 'route-aggregate') -->

<xsd:element name="routing-instance-route-aggregate"/>
<!--#IFMAP-SEMANTICS-IDL
Link('routing-instance-route-aggregate',
'routing-instance', 'route-aggregate', ['ref']) -->

<xsd:complexType name="RoutingPolicyType">
<xsd:annotation>
<xsd:documentation>
Expand Down
10 changes: 10 additions & 0 deletions src/schema/vnc_cfg.xsd
Expand Up @@ -1496,6 +1496,16 @@ targetNamespace="http://www.contrailsystems.com/2012/VNC-CONFIG/0">
Link('interface-route-table-service-instance',
'interface-route-table', 'service-instance', ['ref']) -->

<xsd:element name="routing-policy-service-instance" type="ServiceInterfaceTag"/>
<!--#IFMAP-SEMANTICS-IDL
Link('routing-policy-service-instance',
'bgp:routing-policy', 'service-instance', ['ref']) -->

<xsd:element name="route-aggregate-service-instance" type="ServiceInterfaceTag"/>
<!--#IFMAP-SEMANTICS-IDL
Link('route-aggregate-service-instance',
'bgp:route-aggregate', 'service-instance', ['ref']) -->

<!-- NEED TO DELETE THIS BEFORE RELEASE IN 3.0 BY PNF TEAM -->
<xsd:complexType name='ServiceInstanceVirtualMachineInterfaceType'>
<xsd:all>
Expand Down

0 comments on commit c563fef

Please sign in to comment.