re-enable support for fdio dvr scenario

- Update FDIO scenarios to use master branch images
- Update VPP/HC version to master for all fdio scenarios

apex-os-net-config: Ie6aee86eaccad5fc98820a28f10adc7475cc5e33
apex-tripleo-heat-templates: Ie8b284f64bd6491c389129d8afdaeae8a399b607
apex-puppet-tripleo: I9954240529278e74d93fdf89d2ebc2536249245a

Change-Id: I31740f97052947b5e4688cca47320bc49a902d7c
Signed-off-by: Feng Pan <fpan@redhat.com>
(cherry picked from commit a3c2c8c746470c993d70d92d13415e2b4263cc25)

4 files changed, 79 insertions, 28 deletions

diff --git a/apex/deploy.py b/apex/deploy.py
index 55b1092a..8a3d13ed 100644
--- a/apex/deploy.py
+++ b/apex/deploy.py
@@ -58,6 +58,14 @@ def validate_cross_settings(deploy_settings, net_settings, inventory):
         raise ApexDeployException("Setting a DPDK based dataplane requires"
                                   "a dedicated NIC for tenant network")
 
+    if 'odl_vpp_routing_node' in deploy_settings['deploy_options']:
+        if deploy_settings['deploy_options']['dataplane'] != 'fdio':
+            raise ApexDeployException("odl_vpp_routing_node should only be set"
+                                      "when dataplane is set to fdio")
+        if deploy_settings['deploy_options'].get('dvr') is True:
+            raise ApexDeployException("odl_vpp_routing_node should only be set"
+                                      "when dvr is not enabled")
+
     # TODO(trozet): add more checks here like RAM for ODL, etc
     # check if odl_vpp_netvirt is true and vpp is set
     # Check if fdio and nosdn:
@@ -336,8 +344,8 @@ def main():
         overcloud_deploy.prep_image(deploy_settings, sdn_image, APEX_TEMP_DIR,
                                     root_pw=root_pw)
         opnfv_env = os.path.join(args.deploy_dir, args.env_file)
-        overcloud_deploy.prep_env(deploy_settings, net_settings, opnfv_env,
-                                  net_env_target, APEX_TEMP_DIR)
+        overcloud_deploy.prep_env(deploy_settings, net_settings, inventory,
+                                  opnfv_env, net_env_target, APEX_TEMP_DIR)
         overcloud_deploy.create_deploy_cmd(deploy_settings, net_settings,
                                            inventory, APEX_TEMP_DIR,
                                            args.virtual, args.env_file)
diff --git a/apex/overcloud/config.py b/apex/overcloud/config.py
index e48b254f..a7f7d848 100644
--- a/apex/overcloud/config.py
+++ b/apex/overcloud/config.py
@@ -44,10 +44,14 @@ def create_nic_template(network_settings, deploy_settings, role, template_dir,
     ovs_dpdk_br = ''
     if ds['dataplane'] == 'fdio':
         nets['tenant']['nic_mapping'][role]['phys_type'] = 'vpp_interface'
-        if ds['sdn_controller'] == 'opendaylight' and role == 'compute':
-            nets['external'][0]['nic_mapping'][role]['phys_type'] = \
-                'vpp_interface'
-            ext_net = 'vpp_interface'
+        if ds['sdn_controller'] == 'opendaylight':
+            if role == 'compute':
+                nets['external'][0]['nic_mapping'][role]['phys_type'] = \
+                    'vpp_interface'
+                ext_net = 'vpp_interface'
+            if ds.get('dvr') is True:
+                nets['admin']['nic_mapping'][role]['phys_type'] = \
+                    'linux_bridge'
     elif ds['dataplane'] == 'ovs_dpdk':
         ovs_dpdk_br = 'br-phy'
     if (ds.get('performance', {}).get(role.title(), {}).get('vpp', {})
diff --git a/apex/overcloud/overcloud_deploy.py b/apex/overcloud/overcloud_deploy.py
index a0a66701..ec07b33d 100644
--- a/apex/overcloud/overcloud_deploy.py
+++ b/apex/overcloud/overcloud_deploy.py
@@ -35,6 +35,7 @@ SDN_FILE_MAP = {
         'gluon': 'gluon.yaml',
         'vpp': {
             'odl_vpp_netvirt': 'neutron-opendaylight-netvirt-vpp.yaml',
+            'dvr': 'neutron-opendaylight-fdio-dvr.yaml',
             'default': 'neutron-opendaylight-honeycomb.yaml'
         },
         'default': 'neutron-opendaylight.yaml',
@@ -92,6 +93,34 @@ def build_sdn_env_list(ds, sdn_map, env_list=None):
     return env_list
 
 
+def _get_node_counts(inventory):
+    """
+    Return numbers of controller and compute nodes in inventory
+
+    :param inventory: node inventory data structure
+    :return: number of controller and compute nodes in inventory
+    """
+    if not inventory:
+        raise ApexDeployException("Empty inventory")
+
+    nodes = inventory['nodes']
+    num_control = 0
+    num_compute = 0
+    for node in nodes:
+        if node['capabilities'] == 'profile:control':
+            num_control += 1
+        elif node['capabilities'] == 'profile:compute':
+            num_compute += 1
+        else:
+            # TODO(trozet) do we want to allow capabilities to not exist?
+            logging.error("Every node must include a 'capabilities' key "
+                          "tagged with either 'profile:control' or "
+                          "'profile:compute'")
+            raise ApexDeployException("Node missing capabilities "
+                                      "key: {}".format(node))
+    return num_control, num_compute
+
+
 def create_deploy_cmd(ds, ns, inv, tmp_dir,
                       virtual, env_file='opnfv-environment.yaml'):
 
@@ -117,21 +146,7 @@ def create_deploy_cmd(ds, ns, inv, tmp_dir,
     else:
         deploy_options.append('baremetal-environment.yaml')
 
-    nodes = inv['nodes']
-    num_control = 0
-    num_compute = 0
-    for node in nodes:
-        if 'profile:control' in node['capabilities']:
-            num_control += 1
-        elif 'profile:compute' in node['capabilities']:
-            num_compute += 1
-        else:
-            # TODO(trozet) do we want to allow capabilities to not exist?
-            logging.error("Every node must include a 'capabilities' key "
-                          "tagged with either 'profile:control' or "
-                          "'profile:compute'")
-            raise ApexDeployException("Node missing capabilities "
-                                      "key: {}".format(node))
+    num_control, num_compute = _get_node_counts(inv)
     if num_control == 0 or num_compute == 0:
         logging.error("Detected 0 control or compute nodes.  Control nodes: "
                       "{}, compute nodes{}".format(num_control, num_compute))
@@ -234,13 +249,22 @@ def prep_image(ds, img, tmp_dir, root_pw=None):
         if ds_opts['odl_version'] != con.DEFAULT_ODL_VERSION:
             virt_cmds.extend([
                 {con.VIRT_RUN_CMD: "yum -y remove opendaylight"},
-                {con.VIRT_RUN_CMD: "yum -y install /root/{}/*".format(
-                    ds_opts['odl_version'])},
                 {con.VIRT_RUN_CMD: "rm -rf /etc/puppet/modules/opendaylight"},
                 {con.VIRT_RUN_CMD: "cd /etc/puppet/modules && tar xzf "
                                    "/root/puppet-opendaylight-"
                                    "{}.tar.gz".format(ds_opts['odl_version'])}
             ])
+            if ds_opts['odl_version'] == 'master':
+                virt_cmds.extend([
+                    {con.VIRT_RUN_CMD: "rpm -ivh --nodeps /root/{}/*".format(
+                        ds_opts['odl_version'])}
+                ])
+            else:
+                virt_cmds.extend([
+                    {con.VIRT_RUN_CMD: "yum -y install /root/{}/*".format(
+                        ds_opts['odl_version'])}
+                ])
+
         elif sdn == 'opendaylight' and 'odl_vpp_netvirt' in ds_opts \
                 and ds_opts['odl_vpp_netvirt']:
             virt_cmds.extend([
@@ -288,11 +312,12 @@ def make_ssh_key():
     return private_key.decode('utf-8'), pub_key
 
 
-def prep_env(ds, ns, opnfv_env, net_env, tmp_dir):
+def prep_env(ds, ns, inv, opnfv_env, net_env, tmp_dir):
     """
     Creates modified opnfv/network environments for deployment
     :param ds: deploy settings
     :param ns: network settings
+    :param inv: node inventory
     :param opnfv_env: file path for opnfv-environment file
     :param net_env: file path for network-environment file
     :param tmp_dir: Apex tmp dir
@@ -350,10 +375,9 @@ def prep_env(ds, ns, opnfv_env, net_env, tmp_dir):
             output_line = "      key: '{}'".format(public_key)
 
         if ds_opts['sdn_controller'] == 'opendaylight' and \
-                'odl_vpp_routing_node' in ds_opts and ds_opts[
-                'odl_vpp_routing_node'] != 'dvr':
+                'odl_vpp_routing_node' in ds_opts:
             if 'opendaylight::vpp_routing_node' in line:
-                output_line = ("    opendaylight::vpp_routing_node: ${}.${}"
+                output_line = ("    opendaylight::vpp_routing_node: {}.{}"
                                .format(ds_opts['odl_vpp_routing_node'],
                                        ns['domain_name']))
             elif 'ControllerExtraConfig' in line:
@@ -372,6 +396,17 @@ def prep_env(ds, ns, opnfv_env, net_env, tmp_dir):
             if 'NeutronVPPAgentPhysnets' in line:
                 output_line = ("  NeutronVPPAgentPhysnets: 'datacentre:{}'".
                                format(tenant_ctrl_nic))
+        elif ds_opts['sdn_controller'] == 'opendaylight' and ds_opts.get(
+                'dvr') is True:
+            if 'OS::TripleO::Services::NeutronDhcpAgent' in line:
+                output_line = ''
+            elif 'NeutronDhcpAgentsPerNetwork' in line:
+                num_control, num_compute = _get_node_counts(inv)
+                output_line = ("  NeutronDhcpAgentsPerNetwork: {}"
+                               .format(num_compute))
+            elif 'ComputeServices' in line:
+                output_line = ("  ComputeServices:\n"
+                               "    - OS::TripleO::Services::NeutronDhcpAgent")
 
         if perf:
             for role in 'NovaCompute', 'Controller':
diff --git a/apex/settings/deploy_settings.py b/apex/settings/deploy_settings.py
index 793e43ac..164997ec 100644
--- a/apex/settings/deploy_settings.py
+++ b/apex/settings/deploy_settings.py
@@ -31,13 +31,14 @@ OPT_DEPLOY_SETTINGS = ['performance',
                        'yardstick',
                        'dovetail',
                        'odl_vpp_routing_node',
+                       'dvr',
                        'odl_vpp_netvirt',
                        'barometer']
 
 VALID_ROLES = ['Controller', 'Compute', 'ObjectStorage']
 VALID_PERF_OPTS = ['kernel', 'nova', 'vpp', 'ovs']
 VALID_DATAPLANES = ['ovs', 'ovs_dpdk', 'fdio']
-VALID_ODL_VERSIONS = ['carbon', 'nitrogen', 'master']
+VALID_ODL_VERSIONS = ['carbon', 'nitrogen', 'oxygen', 'master']
 
 
 class DeploySettings(dict):
@@ -110,6 +111,9 @@ class DeploySettings(dict):
                     "Invalid ODL version: {}".format(self[deploy_options][
                         'odl_version']))
 
+        if self['deploy_options']['odl_version'] == 'oxygen':
+            self['deploy_options']['odl_version'] = 'master'
+
         if 'performance' in deploy_options:
             if not isinstance(deploy_options['performance'], dict):
                 raise DeploySettingsException("Performance deploy_option"