DM: Wrong encapsulation when physical interface added to MX

[amit surana]

cannot add VLAN sub-interfaces to physical router (MX). If user tries to add vlan 2001 to a physical interface, DM pushes this:

root@cmbu-tasman# show groups __contrail__ interfaces xe-2/3/2
encapsulation ethernet-bridge;
unit 2001 {
    family bridge;
}

It should instead push this:

set groups __contrail__ interfaces xe-2/3/2 flexible-vlan-tagging
set groups __contrail__ interfaces xe-2/3/2 encapsulation extended-vlan-bridge
set groups __contrail__ interfaces xe-2/3/2 unit 2001 vlan-id 2001

[Nischal Sheth (nsheth)]

Let's fix this by not generating the IFD configuration from DM.

Since DM doesn't have knowledge of PICs/MICs and SW versions,
it will be best to leave the IFD configuration to the user. There
may different devices with slightly different capabilities in
different versions of code. Ideally, we want the user to be able
to use different IFLs on the same IFD for L2 or L3 e.g. unit 0 may
have family bridge while unit 1 has family inet and/or inet6.

[Nischal Sheth (nsheth)]

I got some more information from folks in the MX team.

Based on that let's go with the following:

A. If there's a VLAN tag for the interface (i.e. multiple IFLs per IFD)

set groups __contrail__ interfaces xe-2/3/2 flexible-vlan-tagging
set groups __contrail__ interfaces xe-2/3/2 encapsulation flexible-ethernet-services
set groups __contrail__ interfaces xe-2/3/2 unit 2001 vlan-id 2001
set groups __contrail__ interfaces xe-2/3/2 unit 2001 encapsulation vlan-bridge
set groups __contrail__ interfaces xe-2/3/2 unit 2002 vlan-id 2002
set groups __contrail__ interfaces xe-2/3/2 unit 2002 encapsulation vlan-bridge

This allows the user to create some IFLs for L3 interfaces and make them part of an
L3 VRF.

B. If there's no VLAN tag for the interface (i.e. single IFL for the IFD)

set groups __contrail__ interfaces xe-0/0/1 encapsulation ethernet-bridge
set groups __contrail__ interfaces xe-0/0/1 unit 0 family bridge

[OpenContrail Admin (ci-admin-f)]

Review in progress for https://review.opencontrail.org/13963
Submitter: Suresh Balineni (<email address hidden>)

[OpenContrail Admin (ci-admin-f)]

Review in progress for https://review.opencontrail.org/14021
Submitter: Suresh Balineni (<email address hidden>)

[OpenContrail Admin (ci-admin-f)]

Review in progress for https://review.opencontrail.org/13963
Submitter: Suresh Balineni (<email address hidden>)

[OpenContrail Admin (ci-admin-f)]

Reviewed: https://review.opencontrail.org/14021
Committed: http://github.org/Juniper/contrail-controller/commit/4ed6989403721ba7a3bcef6e564ccae0120f64c7
Submitter: Zuul
Branch: master

commit 4ed6989403721ba7a3bcef6e564ccae0120f64c7
Author: sbalineni <email address hidden>
Date: Wed Sep 23 15:42:11 2015 -0700

DM: l2 interface config for vlan bridging

A. If there's a VLAN tag for the interface (i.e. multiple IFLs per IFD)

set groups __contrail__ interfaces xe-2/3/2 flexible-vlan-tagging
set groups __contrail__ interfaces xe-2/3/2 encapsulation flexible-ethernet-services
set groups __contrail__ interfaces xe-2/3/2 unit 2001 vlan-id 2001
set groups __contrail__ interfaces xe-2/3/2 unit 2001 encapsulation vlan-bridge
set groups __contrail__ interfaces xe-2/3/2 unit 2002 vlan-id 2002
set groups __contrail__ interfaces xe-2/3/2 unit 2002 encapsulation vlan-bridge

B. If there's no VLAN tag for the interface (i.e. single IFL for the IFD)

set groups __contrail__ interfaces xe-0/0/1 encapsulation ethernet-bridge
set groups __contrail__ interfaces xe-0/0/1 unit 0 family bridge

Change-Id: I7f6bcad94ed54a6404ce6db8f2cc7ae0d50a9e54
Closes-Bug: #1486154

[OpenContrail Admin (ci-admin-f)]

Reviewed: https://review.opencontrail.org/13963
Committed: http://github.org/Juniper/contrail-controller/commit/c40060745273379420d9462e3e58388fb18f9ab9
Submitter: Zuul
Branch: R2.20

commit c40060745273379420d9462e3e58388fb18f9ab9
Author: sbalineni <email address hidden>
Date: Mon Sep 21 19:50:40 2015 -0700

DM: l2 interface config for vlan bridging

A. If there's a VLAN tag for the interface (i.e. multiple IFLs per IFD)

set groups __contrail__ interfaces xe-2/3/2 flexible-vlan-tagging
set groups __contrail__ interfaces xe-2/3/2 encapsulation flexible-ethernet-services
set groups __contrail__ interfaces xe-2/3/2 unit 2001 vlan-id 2001
set groups __contrail__ interfaces xe-2/3/2 unit 2001 encapsulation vlan-bridge
set groups __contrail__ interfaces xe-2/3/2 unit 2002 vlan-id 2002
set groups __contrail__ interfaces xe-2/3/2 unit 2002 encapsulation vlan-bridge

B. If there's no VLAN tag for the interface (i.e. single IFL for the IFD)

set groups __contrail__ interfaces xe-0/0/1 encapsulation ethernet-bridge
set groups __contrail__ interfaces xe-0/0/1 unit 0 family bridge

Closes-Bug: #1486154

Change-Id: Ib8d7d1ead9b1bacc0eeeae9d2d7143ac99df182b