Removing sdn_l3 and _l2 scenario features

JIRA: APEX-429

Change-Id: Ifb28bb27f8e58ac5b180454719dfb329c3edf000
Signed-off-by: Dan Radez <dradez@redhat.com>

diff --git a/build/rpm_specs/opnfv-apex-common.spec b/build/rpm_specs/opnfv-apex-common.spec
index 541c1fe..bb7e1e2 100644 (file)
--- a/build/rpm_specs/opnfv-apex-common.spec
+++ b/build/rpm_specs/opnfv-apex-common.spec
@@ -46,11 +46,8 @@ install config/deploy/os-nosdn-performance-ha.yaml %{buildroot}%{_sysconfdir}/op
 install config/deploy/os-nosdn-ovs_dpdk-ha.yaml %{buildroot}%{_sysconfdir}/opnfv-apex/os-nosdn-ovs_dpdk-ha.yaml
 install config/deploy/os-nosdn-kvm-ha.yaml %{buildroot}%{_sysconfdir}/opnfv-apex/os-nosdn-kvm-ha.yaml
 install config/deploy/os-nosdn-kvm-noha.yaml %{buildroot}%{_sysconfdir}/opnfv-apex/os-nosdn-kvm-noha.yaml
-install config/deploy/os-odl_l2-sfc-noha.yaml %{buildroot}%{_sysconfdir}/opnfv-apex/os-odl_l2-sfc-noha.yaml
 install config/deploy/os-odl-bgpvpn-ha.yaml %{buildroot}%{_sysconfdir}/opnfv-apex/os-odl-bgpvpn-ha.yaml
 install config/deploy/os-odl-bgpvpn-noha.yaml %{buildroot}%{_sysconfdir}/opnfv-apex/os-odl-bgpvpn-noha.yaml
-install config/deploy/os-odl_l2-fdio-ha.yaml %{buildroot}%{_sysconfdir}/opnfv-apex/os-odl_l2-fdio-ha.yaml
-install config/deploy/os-odl_l2-fdio-noha.yaml %{buildroot}%{_sysconfdir}/opnfv-apex/os-odl_l2-fdio-noha.yaml
 install config/deploy/os-odl-fdio-noha.yaml %{buildroot}%{_sysconfdir}/opnfv-apex/os-odl-fdio-noha.yaml
 install config/deploy/os-odl_netvirt-fdio-noha.yaml %{buildroot}%{_sysconfdir}/opnfv-apex/os-odl_netvirt-fdio-noha.yaml
 install config/deploy/os-odl-fdio-ha.yaml %{buildroot}%{_sysconfdir}/opnfv-apex/os-odl-fdio-ha.yaml
@@ -132,11 +129,8 @@ install config/inventory/pod_example_settings.yaml %{buildroot}%{_docdir}/opnfv/
 %{_sysconfdir}/opnfv-apex/os-nosdn-ovs_dpdk-ha.yaml
 %{_sysconfdir}/opnfv-apex/os-nosdn-kvm-ha.yaml
 %{_sysconfdir}/opnfv-apex/os-nosdn-kvm-noha.yaml
-%{_sysconfdir}/opnfv-apex/os-odl_l2-sfc-noha.yaml
 %{_sysconfdir}/opnfv-apex/os-odl-bgpvpn-ha.yaml
 %{_sysconfdir}/opnfv-apex/os-odl-bgpvpn-noha.yaml
-%{_sysconfdir}/opnfv-apex/os-odl_l2-fdio-noha.yaml
-%{_sysconfdir}/opnfv-apex/os-odl_l2-fdio-ha.yaml
 %{_sysconfdir}/opnfv-apex/os-odl-fdio-noha.yaml
 %{_sysconfdir}/opnfv-apex/os-odl_netvirt-fdio-noha.yaml
 %{_sysconfdir}/opnfv-apex/os-odl-fdio-ha.yaml
@@ -163,8 +157,10 @@ install config/inventory/pod_example_settings.yaml %{buildroot}%{_docdir}/opnfv/
 %doc %{_docdir}/opnfv/inventory.yaml.example
 
 %changelog
-* Mon May 08 2017 Dan Radez <dradez@redhat.com> - 5.0-2
+* Mon May 08 2017 Dan Radez <dradez@redhat.com> - 5.0-3
 - adding configure-vm
+* Tue Apr 11 2017 Dan Radez <dradez@redhat.com> - 5.0-2
+- Remove l2 scenario files
 * Tue Apr 04 2017 Dan Radez <dradez@redhat.com> - 5.0-1
 - Version update for Euphrates
 - rename to ovs_dpdk

diff --git a/config/deploy/deploy_settings.yaml b/config/deploy/deploy_settings.yaml
index 7406fe6..45324c4 100644 (file)
--- a/config/deploy/deploy_settings.yaml
+++ b/config/deploy/deploy_settings.yaml
@@ -19,10 +19,6 @@ deploy_options:
   # is specified, carbon will be used.
   # odl_version: carbon
 
-  # Whether to configure ODL L3 support. This will disable the Neutron L3 Agent
-  # and use ODL instead.
-  sdn_l3: false
-
   # Whether to install and configure Tacker (VNF Manager)
   tacker: true
 

diff --git a/config/deploy/os-nosdn-fdio-ha.yaml b/config/deploy/os-nosdn-fdio-ha.yaml
index d8af12d..fa7a5b5 100644 (file)
--- a/config/deploy/os-nosdn-fdio-ha.yaml
+++ b/config/deploy/os-nosdn-fdio-ha.yaml
@@ -4,7 +4,6 @@ global_params:
 
 deploy_options:
   sdn_controller: false
-  sdn_l3: false
   tacker: true
   congress: true
   sfc: false

diff --git a/config/deploy/os-nosdn-fdio-noha.yaml b/config/deploy/os-nosdn-fdio-noha.yaml
index 446ddfd..8ace96f 100644 (file)
--- a/config/deploy/os-nosdn-fdio-noha.yaml
+++ b/config/deploy/os-nosdn-fdio-noha.yaml
@@ -4,7 +4,6 @@ global_params:
 
 deploy_options:
   sdn_controller: false
-  sdn_l3: false
   tacker: true
   congress: true
   sfc: false

diff --git a/config/deploy/os-nosdn-kvm-ha.yaml b/config/deploy/os-nosdn-kvm-ha.yaml
index b01a835..dedf730 100644 (file)
--- a/config/deploy/os-nosdn-kvm-ha.yaml
+++ b/config/deploy/os-nosdn-kvm-ha.yaml
@@ -4,7 +4,6 @@ global_params:
 
 deploy_options:
   sdn_controller: false
-  sdn_l3: false
   tacker: true
   congress: true
   sfc: false

diff --git a/config/deploy/os-nosdn-kvm-noha.yaml b/config/deploy/os-nosdn-kvm-noha.yaml
index a9c8d97..1f1fc7c 100644 (file)
--- a/config/deploy/os-nosdn-kvm-noha.yaml
+++ b/config/deploy/os-nosdn-kvm-noha.yaml
@@ -4,7 +4,6 @@ global_params:
 
 deploy_options:
   sdn_controller: false
-  sdn_l3: false
   tacker: true
   congress: true
   sfc: false

diff --git a/config/deploy/os-nosdn-nofeature-ha.yaml b/config/deploy/os-nosdn-nofeature-ha.yaml
index 3c26b83..93a1fb6 100644 (file)
--- a/config/deploy/os-nosdn-nofeature-ha.yaml
+++ b/config/deploy/os-nosdn-nofeature-ha.yaml
@@ -4,7 +4,6 @@ global_params:
 
 deploy_options:
   sdn_controller: false
-  sdn_l3: false
   tacker: true
   congress: true
   sfc: false

diff --git a/config/deploy/os-nosdn-nofeature-noha.yaml b/config/deploy/os-nosdn-nofeature-noha.yaml
index 2cd6633..77e5d5e 100644 (file)
--- a/config/deploy/os-nosdn-nofeature-noha.yaml
+++ b/config/deploy/os-nosdn-nofeature-noha.yaml
@@ -4,7 +4,6 @@ global_params:
 
 deploy_options:
   sdn_controller: false
-  sdn_l3: false
   tacker: true
   congress: true
   sfc: false

diff --git a/config/deploy/os-nosdn-ovs_dpdk-ha.yaml b/config/deploy/os-nosdn-ovs_dpdk-ha.yaml
index 8e31221..94ffb9a 100644 (file)
--- a/config/deploy/os-nosdn-ovs_dpdk-ha.yaml
+++ b/config/deploy/os-nosdn-ovs_dpdk-ha.yaml
@@ -4,7 +4,6 @@ global_params:
 
 deploy_options:
   sdn_controller: false
-  sdn_l3: false
   tacker: true
   congress: true
   sfc: false

diff --git a/config/deploy/os-nosdn-ovs_dpdk-noha.yaml b/config/deploy/os-nosdn-ovs_dpdk-noha.yaml
index f28b0c4..ec6baa6 100644 (file)
--- a/config/deploy/os-nosdn-ovs_dpdk-noha.yaml
+++ b/config/deploy/os-nosdn-ovs_dpdk-noha.yaml
@@ -4,7 +4,6 @@ global_params:
 
 deploy_options:
   sdn_controller: false
-  sdn_l3: false
   tacker: true
   congress: true
   sfc: false

diff --git a/config/deploy/os-nosdn-performance-ha.yaml b/config/deploy/os-nosdn-performance-ha.yaml
index f5d0656..392d1a6 100644 (file)
--- a/config/deploy/os-nosdn-performance-ha.yaml
+++ b/config/deploy/os-nosdn-performance-ha.yaml
@@ -4,7 +4,6 @@ global_params:
 
 deploy_options:
   sdn_controller: false
-  sdn_l3: false
   tacker: true
   congress: true
   sfc: false

diff --git a/config/deploy/os-ocl-nofeature-ha.yaml b/config/deploy/os-ocl-nofeature-ha.yaml
index bc05fa4..82b2878 100644 (file)
--- a/config/deploy/os-ocl-nofeature-ha.yaml
+++ b/config/deploy/os-ocl-nofeature-ha.yaml
@@ -4,7 +4,6 @@ global_params:
 
 deploy_options:
   sdn_controller: opencontrail
-  sdn_l3: false
   tacker: true
   congress: true
   sfc: false

diff --git a/config/deploy/os-odl-bgpvpn-ha.yaml b/config/deploy/os-odl-bgpvpn-ha.yaml
index b55c459..424ac64 100644 (file)
--- a/config/deploy/os-odl-bgpvpn-ha.yaml
+++ b/config/deploy/os-odl-bgpvpn-ha.yaml
@@ -4,7 +4,6 @@ global_params:
 
 deploy_options:
   sdn_controller: opendaylight
-  sdn_l3: true
   odl_version: carbon
   tacker: false
   congress: true

diff --git a/config/deploy/os-odl-bgpvpn-noha.yaml b/config/deploy/os-odl-bgpvpn-noha.yaml
index babb931..53510a8 100644 (file)
--- a/config/deploy/os-odl-bgpvpn-noha.yaml
+++ b/config/deploy/os-odl-bgpvpn-noha.yaml
@@ -4,7 +4,6 @@ global_params:
 
 deploy_options:
   sdn_controller: opendaylight
-  sdn_l3: true
   odl_version: carbon
   tacker: false
   congress: true

diff --git a/config/deploy/os-odl-csit-noha.yaml b/config/deploy/os-odl-csit-noha.yaml
index 67bdec1..661cc00 100644 (file)
--- a/config/deploy/os-odl-csit-noha.yaml
+++ b/config/deploy/os-odl-csit-noha.yaml
@@ -5,7 +5,6 @@ global_params:
 deploy_options:
   sdn_controller: opendaylight
   odl_version: carbon
-  sdn_l3: true
   tacker: false
   congress: false
   sfc: false

diff --git a/config/deploy/os-odl-fdio-ha.yaml b/config/deploy/os-odl-fdio-ha.yaml
index cb7643d..c02b22b 100644 (file)
--- a/config/deploy/os-odl-fdio-ha.yaml
+++ b/config/deploy/os-odl-fdio-ha.yaml
@@ -4,7 +4,6 @@ global_params:
 
 deploy_options:
   sdn_controller: opendaylight
-  sdn_l3: true
   odl_version: carbon
   odl_vpp_routing_node: overcloud-novacompute-0
   tacker: true

diff --git a/config/deploy/os-odl-fdio-noha.yaml b/config/deploy/os-odl-fdio-noha.yaml
index 12c1fa6..4aab052 100644 (file)
--- a/config/deploy/os-odl-fdio-noha.yaml
+++ b/config/deploy/os-odl-fdio-noha.yaml
@@ -4,7 +4,6 @@ global_params:
 
 deploy_options:
   sdn_controller: opendaylight
-  sdn_l3: true
   odl_version: carbon
   odl_vpp_routing_node: overcloud-novacompute-0
   tacker: true

diff --git a/config/deploy/os-odl-gluon-noha.yaml b/config/deploy/os-odl-gluon-noha.yaml
index 03ca103..b7e2e05 100644 (file)
--- a/config/deploy/os-odl-gluon-noha.yaml
+++ b/config/deploy/os-odl-gluon-noha.yaml
@@ -4,7 +4,6 @@ global_params:
 
 deploy_options:
   sdn_controller: opendaylight
-  sdn_l3: true
   odl_version: carbon
   tacker: false
   congress: true

diff --git a/config/deploy/os-odl-nofeature-ha.yaml b/config/deploy/os-odl-nofeature-ha.yaml
index c4bce1c..bab9d0e 100644 (file)
--- a/config/deploy/os-odl-nofeature-ha.yaml
+++ b/config/deploy/os-odl-nofeature-ha.yaml
@@ -5,7 +5,6 @@ global_params:
 deploy_options:
   sdn_controller: opendaylight
   odl_version: carbon
-  sdn_l3: true
   tacker: true
   congress: true
   sfc: false

diff --git a/config/deploy/os-odl-nofeature-noha.yaml b/config/deploy/os-odl-nofeature-noha.yaml
index 0c9b4fb..32014d0 100644 (file)
--- a/config/deploy/os-odl-nofeature-noha.yaml
+++ b/config/deploy/os-odl-nofeature-noha.yaml
@@ -5,7 +5,6 @@ global_params:
 deploy_options:
   sdn_controller: opendaylight
   odl_version: carbon
-  sdn_l3: true
   tacker: true
   congress: true
   sfc: false

diff --git a/config/deploy/os-odl-ovs_dpdk-ha.yaml b/config/deploy/os-odl-ovs_dpdk-ha.yaml
index 8bf38e2..a314f8c 100644 (file)
--- a/config/deploy/os-odl-ovs_dpdk-ha.yaml
+++ b/config/deploy/os-odl-ovs_dpdk-ha.yaml
@@ -5,7 +5,6 @@ global_params:
 deploy_options:
   sdn_controller: opendaylight
   odl_version: carbon
-  sdn_l3: true
   tacker: true
   congress: true
   sfc: false

diff --git a/config/deploy/os-odl-ovs_dpdk-noha.yaml b/config/deploy/os-odl-ovs_dpdk-noha.yaml
index 6d6be98..8a09ffa 100644 (file)
--- a/config/deploy/os-odl-ovs_dpdk-noha.yaml
+++ b/config/deploy/os-odl-ovs_dpdk-noha.yaml
@@ -5,7 +5,6 @@ global_params:
 deploy_options:
   sdn_controller: opendaylight
   odl_version: carbon
-  sdn_l3: true
   tacker: true
   congress: true
   sfc: false

diff --git a/config/deploy/os-odl_l2-fdio-ha.yaml b/config/deploy/os-odl_l2-fdio-ha.yaml
deleted file mode 100644 (file)
index 68777db..0000000
--- a/config/deploy/os-odl_l2-fdio-ha.yaml
+++ /dev/null
@@ -1,37 +0,0 @@
----
-global_params:
-  ha_enabled: true
-
-deploy_options:
-  sdn_controller: opendaylight
-  sdn_l3: false
-  odl_version: carbon
-  tacker: true
-  congress: true
-  sfc: false
-  vpn: false
-  vpp: true
-  dataplane: fdio
-  performance:
-    Controller:
-      kernel:
-        hugepages: 1024
-        hugepagesz: 2M
-        intel_iommu: 'on'
-        iommu: pt
-        isolcpus: 1,2
-      vpp:
-        main-core: 1
-        corelist-workers: 2
-        uio-driver: uio_pci_generic
-    Compute:
-      kernel:
-        hugepagesz: 2M
-        hugepages: 2048
-        intel_iommu: 'on'
-        iommu: pt
-        isolcpus: 1,2
-      vpp:
-        main-core: 1
-        corelist-workers: 2
-        uio-driver: uio_pci_generic

diff --git a/config/deploy/os-odl_l2-fdio-noha.yaml b/config/deploy/os-odl_l2-fdio-noha.yaml
deleted file mode 100644 (file)
index ab23e97..0000000
--- a/config/deploy/os-odl_l2-fdio-noha.yaml
+++ /dev/null
@@ -1,37 +0,0 @@
----
-global_params:
-  ha_enabled: false
-
-deploy_options:
-  sdn_controller: opendaylight
-  sdn_l3: false
-  odl_version: carbon
-  tacker: true
-  congress: true
-  sfc: false
-  vpn: false
-  vpp: true
-  dataplane: fdio
-  performance:
-    Controller:
-      kernel:
-        hugepages: 1024
-        hugepagesz: 2M
-        intel_iommu: 'on'
-        iommu: pt
-        isolcpus: 1,2
-      vpp:
-        main-core: 1
-        corelist-workers: 2
-        uio-driver: uio_pci_generic
-    Compute:
-      kernel:
-        hugepagesz: 2M
-        hugepages: 2048
-        intel_iommu: 'on'
-        iommu: pt
-        isolcpus: 1,2
-      vpp:
-        main-core: 1
-        corelist-workers: 2
-        uio-driver: uio_pci_generic

diff --git a/config/deploy/os-odl_l2-sfc-noha.yaml b/config/deploy/os-odl_l2-sfc-noha.yaml
deleted file mode 100644 (file)
index 8104e7e..0000000
--- a/config/deploy/os-odl_l2-sfc-noha.yaml
+++ /dev/null
@@ -1,12 +0,0 @@
----
-global_params:
-  ha_enabled: false
-
-deploy_options:
-  sdn_controller: opendaylight
-  sdn_l3: false
-  odl_version: carbon
-  tacker: true
-  congress: true
-  sfc: true
-  vpn: false

diff --git a/config/deploy/os-onos-nofeature-ha.yaml b/config/deploy/os-onos-nofeature-ha.yaml
index 542f6df..0ad1bc1 100644 (file)
--- a/config/deploy/os-onos-nofeature-ha.yaml
+++ b/config/deploy/os-onos-nofeature-ha.yaml
@@ -4,7 +4,6 @@ global_params:
 
 deploy_options:
   sdn_controller: onos
-  sdn_l3: true
   tacker: true
   congress: true
   sfc: false

diff --git a/config/deploy/os-onos-sfc-ha.yaml b/config/deploy/os-onos-sfc-ha.yaml
index 2d68573..90a2f43 100644 (file)
--- a/config/deploy/os-onos-sfc-ha.yaml
+++ b/config/deploy/os-onos-sfc-ha.yaml
@@ -4,7 +4,6 @@ global_params:
 
 deploy_options:
   sdn_controller: onos
-  sdn_l3: true
   tacker: true
   congress: true
   sfc: true

diff --git a/config/deploy/os-ovn-nofeature-noha.yaml b/config/deploy/os-ovn-nofeature-noha.yaml
index d2702c9..8c8c5f9 100644 (file)
--- a/config/deploy/os-ovn-nofeature-noha.yaml
+++ b/config/deploy/os-ovn-nofeature-noha.yaml
@@ -4,7 +4,6 @@ global_params:
 
 deploy_options:
   sdn_controller: ovn
-  sdn_l3: false
   tacker: false
   congress: true
   sfc: false

diff --git a/docs/release/installation/architecture.rst b/docs/release/installation/architecture.rst
index 232e72b..5d019ed 100644 (file)
--- a/docs/release/installation/architecture.rst
+++ b/docs/release/installation/architecture.rst
@@ -141,13 +141,13 @@ issues per scenario.  The following scenarios correspond to a supported
 +-------------------------+-------------+---------------+
 | os-nosdn-performance-ha | Apex        | Yes           |
 +-------------------------+-------------+---------------+
-| os-odl_l3-nofeature-ha  | Apex        | Yes           |
+| os-odl-nofeature-ha     | Apex        | Yes           |
 +-------------------------+-------------+---------------+
-| os-odl_l3-nofeature-noha| Apex        | Yes           |
+| os-odl-nofeature-noha   | Apex        | Yes           |
 +-------------------------+-------------+---------------+
-| os-odl_l3-ovs_dpdk-ha   | OVS for NFV | Yes           |
+| os-odl-ovs_dpdk-ha      | OVS for NFV | Yes           |
 +-------------------------+-------------+---------------+
-| os-odl_l3-ovs_dpdk-noha | OVS for NFV | Yes           |
+| os-odl-ovs_dpdk-noha    | OVS for NFV | Yes           |
 +-------------------------+-------------+---------------+
 | os-odl-bgpvpn-ha        | SDNVPN      | Yes           |
 +-------------------------+-------------+---------------+
@@ -155,17 +155,11 @@ issues per scenario.  The following scenarios correspond to a supported
 +-------------------------+-------------+---------------+
 | os-odl-gluon-noha       | GluOn       | Yes           |
 +-------------------------+-------------+---------------+
-| os-odl_l3-csit-noha     | Apex        | Yes           |
+| os-odl-csit-noha        | Apex        | Yes           |
 +-------------------------+-------------+---------------+
-| os-odl_l3-fdio-ha       | FDS         | Yes           |
+| os-odl-fdio-ha          | FDS         | Yes           |
 +-------------------------+-------------+---------------+
-| os-odl_l3-fdio-noha     | FDS         | Yes           |
-+-------------------------+-------------+---------------+
-| os-odl_l2-fdio-ha       | FDS         | Yes           |
-+-------------------------+-------------+---------------+
-| os-odl_l2-fdio-noha     | FDS         | Yes           |
-+-------------------------+-------------+---------------+
-| os-odl_l2-sfc-noha      | SFC         | No            |
+| os-odl-fdio-noha        | FDS         | Yes           |
 +-------------------------+-------------+---------------+
 | os-onos-nofeature-ha    | ONOSFW      | No            |
 +-------------------------+-------------+---------------+

diff --git a/lib/overcloud-deploy-functions.sh b/lib/overcloud-deploy-functions.sh
index f26a72a..332a711 100755 (executable)
--- a/lib/overcloud-deploy-functions.sh
+++ b/lib/overcloud-deploy-functions.sh
@@ -36,10 +36,8 @@ function overcloud_deploy {
     elif [ "${deploy_options_array['vpp']}" == 'True' ]; then
       if [ "${deploy_options_array['odl_vpp_netvirt']}" == "True" ]; then
         DEPLOY_OPTIONS+=" -e /usr/share/openstack-tripleo-heat-templates/environments/neutron-opendaylight-netvirt-vpp.yaml"
-      elif [ "${deploy_options_array['sdn_l3']}" == "True" ]; then
-        DEPLOY_OPTIONS+=" -e /usr/share/openstack-tripleo-heat-templates/environments/neutron-opendaylight-honeycomb.yaml"
       else
-        DEPLOY_OPTIONS+=" -e /usr/share/openstack-tripleo-heat-templates/environments/neutron-opendaylight-honeycomb-l2.yaml"
+        DEPLOY_OPTIONS+=" -e /usr/share/openstack-tripleo-heat-templates/environments/neutron-opendaylight-honeycomb.yaml"
       fi
     else
       DEPLOY_OPTIONS+=" -e /usr/share/openstack-tripleo-heat-templates/environments/neutron-opendaylight.yaml"

diff --git a/lib/python/apex/deploy_settings.py b/lib/python/apex/deploy_settings.py
index 48ce340..1025fce 100644 (file)
--- a/lib/python/apex/deploy_settings.py
+++ b/lib/python/apex/deploy_settings.py
@@ -15,7 +15,6 @@ from .common import utils
 
 REQ_DEPLOY_SETTINGS = ['sdn_controller',
                        'odl_version',
-                       'sdn_l3',
                        'tacker',
                        'congress',
                        'dataplane',

diff --git a/lib/python/apex_python_utils.py b/lib/python/apex_python_utils.py
index 1f49d47..c4c6dfe 100755 (executable)
--- a/lib/python/apex_python_utils.py
+++ b/lib/python/apex_python_utils.py
@@ -113,16 +113,14 @@ def build_nic_template(args):
 
     if ds['dataplane'] == 'fdio':
         nets['tenant']['nic_mapping'][args.role]['phys_type'] = 'vpp_interface'
-        if ds['sdn_l3']:
-            nets['external'][0]['nic_mapping'][args.role]['phys_type'] =\
-                'vpp_interface'
+        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']
-        if ds['sdn_l3']:
-            nets['external'][0]['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.get('performance', {}).get(args.role.title(), {}).get('vpp', {})\
             .get('interface-options'):
         nets['tenant']['nic_mapping'][args.role]['interface-options'] =\

diff --git a/lib/undercloud-functions.sh b/lib/undercloud-functions.sh
index a17036a..425ef42 100755 (executable)
--- a/lib/undercloud-functions.sh
+++ b/lib/undercloud-functions.sh
@@ -135,12 +135,10 @@ function configure_undercloud {
   scp ${SSH_OPTIONS[@]} $APEX_TMP_DIR/network-environment.yaml "stack@$UNDERCLOUD":
 
   # check for ODL L3/ONOS
-  if [ "${deploy_options_array['sdn_l3']}" == 'True' ]; then
-    if [ "${deploy_options_array['dataplane']}" == 'fdio' ]; then
-      ext_net_type=vpp_interface
-    else
-      ext_net_type=br-ex
-    fi
+  if [ "${deploy_options_array['dataplane']}" == 'fdio' ]; then
+    ext_net_type=vpp_interface
+  else
+    ext_net_type=br-ex
   fi
 
   if [ "${deploy_options_array['dataplane']}" == 'ovs_dpdk' ]; then

diff --git a/tests/test_apex_deploy_settings.py b/tests/test_apex_deploy_settings.py
index 5882eb9..00eb274 100644 (file)
--- a/tests/test_apex_deploy_settings.py
+++ b/tests/test_apex_deploy_settings.py
@@ -29,7 +29,6 @@ deploy_files = ('deploy_settings.yaml',
                 'os-nosdn-ovs_dpdk-ha.yaml',
                 'os-nosdn-performance-ha.yaml',
                 'os-odl-nofeature-ha.yaml',
-                'os-odl_l2-sfc-noha.yaml',
                 'os-onos-nofeature-ha.yaml',
                 'os-onos-sfc-ha.yaml')