From affa1d140da054d2ef6d4f15da4fd8d6ee37a332 Mon Sep 17 00:00:00 2001 From: Feng Pan Date: Thu, 10 Aug 2017 14:27:44 -0400 Subject: Remove extra VPP interface from fdio-nosdn scenarios Also set NeutronNetworkVLANRanges for daily environment. JIRA: APEX-502 Change-Id: I0a53ad8b0bce7a721104b84a2aa7ea38c510a7e7 Signed-off-by: Feng Pan --- lib/python/apex_python_utils.py | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'lib/python') diff --git a/lib/python/apex_python_utils.py b/lib/python/apex_python_utils.py index c4c6dfe8..063aa003 100755 --- a/lib/python/apex_python_utils.py +++ b/lib/python/apex_python_utils.py @@ -113,14 +113,16 @@ 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('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'] =\ -- cgit 1.2.3-korg