From: Feng Pan <fpan@redhat.com>
Date: Thu, 10 Aug 2017 18:27:44 +0000 (-0400)
Subject: Remove extra VPP interface from fdio-nosdn scenarios
X-Git-Tag: opnfv-5.0.0~100^2
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=affa1d140da054d2ef6d4f15da4fd8d6ee37a332;p=apex.git

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 <fpan@redhat.com>
---

diff --git a/build/opnfv-environment.yaml b/build/opnfv-environment.yaml
index 8140d0d7..8bd1c10b 100644
--- a/build/opnfv-environment.yaml
+++ b/build/opnfv-environment.yaml
@@ -12,6 +12,8 @@ parameter_defaults:
   NeutronEnableDHCPMetadata: true
   NeutronEnableIsolatedMetadata: true
   NeutronPluginExtensions: 'qos,port_security,data_plane_status'
+  # TODO: VLAN Ranges should be configurable from network settings
+  NeutronNetworkVLANRanges: 'datacentre:500:525'
   # NeutronVPPAgentPhysnets:
   # NovaSchedulerDefaultFilters:
   # # Kernel arguments, this value will be set to kernel arguments specified
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'] =\