summaryrefslogtreecommitdiffstats
path: root/lib/python/apex_python_utils.py
diff options
context:
space:
mode:
Diffstat (limited to 'lib/python/apex_python_utils.py')
-rwxr-xr-xlib/python/apex_python_utils.py13
1 files changed, 9 insertions, 4 deletions
diff --git a/lib/python/apex_python_utils.py b/lib/python/apex_python_utils.py
index c4c6dfe8..70fc592d 100755
--- a/lib/python/apex_python_utils.py
+++ b/lib/python/apex_python_utils.py
@@ -113,14 +113,19 @@ def build_nic_template(args):
if ds['dataplane'] == 'fdio':
nets['tenant']['nic_mapping'][args.role]['phys_type'] = 'vpp_interface'
- nets['external'][0]['nic_mapping'][args.role]['phys_type'] =\
- 'vpp_interface'
+ if ds['sdn_controller'] == 'opendaylight':
+ nets['external'][0]['nic_mapping'][args.role]['phys_type'] =\
+ 'vpp_interface'
+ if ds.get('odl_vpp_routing_node') == 'dvr':
+ nets['admin']['nic_mapping'][args.role]['phys_type'] =\
+ 'linux_bridge'
if ds.get('performance', {}).get(args.role.title(), {}).get('vpp', {})\
.get('uio-driver'):
nets['tenant']['nic_mapping'][args.role]['uio-driver'] =\
ds['performance'][args.role.title()]['vpp']['uio-driver']
- nets['external'][0]['nic_mapping'][args.role]['uio-driver'] =\
- ds['performance'][args.role.title()]['vpp']['uio-driver']
+ if ds['sdn_controller'] == 'opendaylight':
+ nets['external'][0]['nic_mapping'][args.role]['uio-driver'] =\
+ ds['performance'][args.role.title()]['vpp']['uio-driver']
if ds.get('performance', {}).get(args.role.title(), {}).get('vpp', {})\
.get('interface-options'):
nets['tenant']['nic_mapping'][args.role]['interface-options'] =\