Add VPP interface options support

Interface options is needed for nosdn-fdio scenario to disable
vlan strip offloading for enic.

Change-Id: I7d7e3d7e6e0c822a13113911a41a3d076ecbd509
Signed-off-by: Feng Pan <fpan@redhat.com>

diff --git a/build/nics-template.yaml.jinja2 b/build/nics-template.yaml.jinja2
index 0913fa9..2301618 100644 (file)
--- a/build/nics-template.yaml.jinja2
+++ b/build/nics-template.yaml.jinja2
@@ -180,6 +180,9 @@ resources:
               {%- if 'uio-driver' in nets['tenant']['nic_mapping'][role] %}
               uio_driver: {{ nets['tenant']['nic_mapping'][role]['uio-driver'] }}
               {%- endif %}
+              {%- if 'interface-options' in nets['tenant']['nic_mapping'][role] %}
+              options: '{{ nets['tenant']['nic_mapping'][role]['interface-options'] }}'
+              {%- endif %}
               use_dhcp: false
               addresses:
                 -

diff --git a/config/deploy/os-nosdn-fdio-ha.yaml b/config/deploy/os-nosdn-fdio-ha.yaml
index 05b075a..3f0f8a2 100644 (file)
--- a/config/deploy/os-nosdn-fdio-ha.yaml
+++ b/config/deploy/os-nosdn-fdio-ha.yaml
@@ -22,6 +22,7 @@ deploy_options:
         main-core: 1
         corelist-workers: 2
         uio-driver: uio_pci_generic
+        interface-options: "vlan-strip-offload off"
     Compute:
       kernel:
         hugepagesz: 2M
@@ -33,3 +34,4 @@ deploy_options:
         main-core: 1
         corelist-workers: 2
         uio-driver: uio_pci_generic
+        interface-options: "vlan-strip-offload off"

diff --git a/config/deploy/os-nosdn-fdio-noha.yaml b/config/deploy/os-nosdn-fdio-noha.yaml
index 321d90c..5f27bed 100644 (file)
--- a/config/deploy/os-nosdn-fdio-noha.yaml
+++ b/config/deploy/os-nosdn-fdio-noha.yaml
@@ -22,6 +22,7 @@ deploy_options:
         main-core: 1
         corelist-workers: 2
         uio-driver: uio_pci_generic
+        interface-options: "vlan-strip-offload off"
     Compute:
       kernel:
         hugepagesz: 2M
@@ -33,3 +34,4 @@ deploy_options:
         main-core: 1
         corelist-workers: 2
         uio-driver: uio_pci_generic
+        interface-options: "vlan-strip-offload off"

diff --git a/lib/python/apex_python_utils.py b/lib/python/apex_python_utils.py
index 830af36..1f49d47 100755 (executable)
--- a/lib/python/apex_python_utils.py
+++ b/lib/python/apex_python_utils.py
@@ -123,6 +123,10 @@ def build_nic_template(args):
         if ds['sdn_l3']:
             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'] =\
+            ds['performance'][args.role.title()]['vpp']['interface-options']
 
     print(template.render(nets=nets,
                           role=args.role,