Fix #205 - remove duplicate vmtracer & pim for ethernet interfaces

[titom73]

After merge conflict, vmtracer and pim were added twice in template.
This PR remove duplication and do correct order to group ospf and isis in the template.

[carlbuchmann]

I reviewed and tested and what needs to be updated is the order in which pim ipv4 sparse-mode appears in the CLI.

pim ipv4 sparse-mode is between ip ospf area x and isis enable EVPN_UNDERLAY

See example below:

interface Ethernet1
   description P2P_LINK_TO_DC1-SPINE1_Ethernet6
   no switchport
   ip address 172.31.255.41/31
   ip ospf area 0.0.0.0
   pim ipv4 sparse-mode
   isis enable EVPN_UNDERLAY
   isis metric 50
   isis network point-to-point
   vmtracer vmware-esx
DC1-BL1A(config-if-Et1)#

[titom73]

Not sure about which commit you took for testing, but with what I have pushed and the following yaml file

  Ethernet4/10/1:
    description: P2P_LINK_TO_CL8_Ethernet49/1
    mtu: 9214
    type: routed
    ip_address: 10.50.0.55/31
    ipv6_address: 1b11:3a00:22b0:0088::55/127
    isis_enable: EVPN_UNDERLAY
    isis_metric: 50
    isis_network_point_to_point: true
    pim:
      ipv4:
        sparse_mode: true
    ospf_network_point_to_point: true
    ospf_area: 0.0.0.0

I’ve got correct order:

interface Ethernet4/10/1
   description P2P_LINK_TO_CL8_Ethernet49/1
   mtu 9214
   no switchport
   ip address 10.50.0.55/31
   ipv6 address 1b11:3a00:22b0:0088::55/127
   ip ospf network point-to-point
   ip ospf area 0.0.0.0
   isis enable EVPN_UNDERLAY
   isis metric 50
   isis network point-to-point
   pim ipv4 sparse-mode
!

[carlbuchmann]

LGTM