From f15a3439c93b9075d6af58cf80fec651a2d74c34 Mon Sep 17 00:00:00 2001 From: Prakash Bailkeri Date: Mon, 28 Nov 2016 11:17:27 +0530 Subject: [PATCH] Schema changes for PBB EVPN Main changes: 1. MAC learning/aging/mac-move attributes in virtual network/global config 2. PBB configurations on Virtual network 3. bridge domina ifmap identifier and its link to virtual network 4. Mapping VMI to bridge domain based on vlan tag 5. Leaf indication in xmpp enet message 6. Sticky bit indication in xmpp unicast/enet message. This indicates that address is statically provisioned and can't move. Change-Id: I0814f9b1c80cbb61bb2f8759ae3a4a7a4d7a9169 Related-bug: #1645092 --- src/schema/vnc_cfg.xsd | 272 ++++++++++++++++++++++++++++++++++++ src/schema/xmpp_enet.xsd | 2 + src/schema/xmpp_unicast.xsd | 1 + 3 files changed, 275 insertions(+) diff --git a/src/schema/vnc_cfg.xsd b/src/schema/vnc_cfg.xsd index 0b905e8105e..acb459ef329 100644 --- a/src/schema/vnc_cfg.xsd +++ b/src/schema/vnc_cfg.xsd @@ -2837,4 +2837,276 @@ targetNamespace="http://www.contrailsystems.com/2012/VNC-CONFIG/0"> + + + + + Action to be taken when one of the following exceptions occur: + * number of MACs learnt exceeds the configured limit + * number of MAC moves exceeds the configured limit + Possible actions can be + 1. LOG + 2. ALARM + 3. SHUTDOWN + 4. DROP + Currently only LOG option will be supported + + + + + + + + + + + + + + This property defines the MAC limit and MAC limit exceed actions + + + + + + + + + + MAC move limit is calculated based on number of MAC move in a given + time interval. This property defines the time interval + Default MAC move time window is set to 10 seconds + + + + + + + + + + + + + This property defines the permitted MAC moves in a specified time + and actions to be taken when MAC move limit exceeds + + + + + + + + + + + + + + + + + + + + + MAC aging time in seconds + MAC aging time ranges from 10 seconds to 1 day(86400 secs) + Special value of 0 means MAC aging is disabled + Default MAC aging time is set to 5 Minutes(300 seconds) + + + + + + + + + + + + + + + + + Following attribute will be configured on the global level + MAC learning control + MAC move control + MAC aging time + These configurations are applied on the Virtual Network + that has MAC learning enabled and above parameters are not + explicitly configured + + + + + + + + + + + Instance Service Identifier or I-SID is a 24 bit number that + uniquely identifies an I-Component. It is unique across a service + provider's PBB network. + + + + + + + + + + + + + + + + Following attribute will be configured on the bridge domain + MAC learning enabled + MAC learning control + MAC move control + MAC aging time + These configurations are derived from the Virtual Network to the + bridge domain if not explicitly configured. + + + + + + + + + + + + + + This flag enables vlan tag(dot1Q tag) based bridge domain + classification for virtual-machine-interface + + In the current release, bridge domain classification based on vlan + tag will not be supported. Virtual machine interface will be mapped + to single bridge domain for tagged/priority-tagged/untagged traffic. + + + + + + + + + + + + + + + VLAN tag 0 means incoming packet is either untagged or + priority tagged + + + + + + + + + Virtual machine interface is mapped to bridge domain based on the + incoming 802.1Q vlan tag. + + This link attribute works along with vlan-tag-based-bridge-domain + flag on the virtual-machine-interface + + 1. if vlan-tag-based-bridge-domain is false + All traffic (tagged/priority tagged/untagged) will be assigned to + single bridge domain. + + 2. if vlan-tag-based-bridge-domain is true + Incoming traffic will be mapped to bridge domain based on vlan + tag of the incoming traffic. + Untagged/priority tagged traffic will be mapped to bridge domain + with link attribute where vlan-tag = 0. + Tagged traffic will be mapped to bridge domain with link + attribute where vlan-tag = incoming vlan tag. + For all tagged traffic where corresponding bridge domain mapping + is missing will be dropped. + + In the current release, vlan-tag-based-bridge-domain will not be + supported and single bridge domain will be linked to virtual machine + interface. So all traffic (tagged/priority tagged/untagged) will be + assigned to this single bridge domain. + + + + + + + + + + + + + This Boolean will allow/disallow L2 communication between two + endpoints connected to vRouters in a virtual network. + When it is disabled, endpoint communication happens via a L3 gateway + provisioned in the remote PE. + + + diff --git a/src/schema/xmpp_enet.xsd b/src/schema/xmpp_enet.xsd index 9a65953a275..3891f96b904 100644 --- a/src/schema/xmpp_enet.xsd +++ b/src/schema/xmpp_enet.xsd @@ -53,6 +53,7 @@ xsd:targetNamespace="http://www.contrailsystems.com/xmpp-enet-cfg.xsd"> + @@ -60,6 +61,7 @@ xsd:targetNamespace="http://www.contrailsystems.com/xmpp-enet-cfg.xsd"> + diff --git a/src/schema/xmpp_unicast.xsd b/src/schema/xmpp_unicast.xsd index 5ec36e44d8a..5d8a1e75b34 100644 --- a/src/schema/xmpp_unicast.xsd +++ b/src/schema/xmpp_unicast.xsd @@ -78,6 +78,7 @@ xsd:targetNamespace="http://www.contrailsystems.com/bgp-l3vpn-unicast-cfg.xsd"> +