Merge "Fixes tacker heat_uri config"

[apex.git] / lib / python / apex / deploy_env.py

diff --git a/lib/python/apex/deploy_env.py b/lib/python/apex/deploy_env.py
index be8779a..816dc11 100644 (file)
--- a/lib/python/apex/deploy_env.py
+++ b/lib/python/apex/deploy_env.py
@@ -12,16 +12,21 @@ import yaml
 import logging
 
 REQ_DEPLOY_SETTINGS = ['sdn_controller',
+                       'odl_version',
                        'sdn_l3',
                        'tacker',
                        'congress',
+                       'dataplane',
                        'sfc',
-                       'vpn']
+                       'vpn',
+                       'vpp']
 
-OPT_DEPLOY_SETTINGS = ['performance']
+OPT_DEPLOY_SETTINGS = ['performance', 'vsperf']
 
 VALID_ROLES = ['Controller', 'Compute', 'ObjectStorage']
-VALID_PERF_OPTS = ['kernel','nova']
+VALID_PERF_OPTS = ['kernel', 'nova']
+VALID_DATAPLANES = ['ovs', 'ovs_dpdk', 'fdio']
+
 
 class DeploySettings:
     """
@@ -45,59 +50,74 @@ class DeploySettings:
 
         if 'deploy_options' not in self.deploy_settings:
             raise DeploySettingsException("No deploy options provided in"
-                                          "deploy settings file")
+                                          " deploy settings file")
         if 'global_params' not in self.deploy_settings:
             raise DeploySettingsException("No global options provided in"
-                                          "deploy settings file")
+                                          " deploy settings file")
 
         deploy_options = self.deploy_settings['deploy_options']
         if not isinstance(deploy_options, dict):
             raise DeploySettingsException("deploy_options should be a list")
 
-        for option in deploy_options:
-            if option not in REQ_DEPLOY_SETTINGS + OPT_DEPLOY_SETTINGS:
+        for setting, value in deploy_options.items():
+            if setting not in REQ_DEPLOY_SETTINGS + OPT_DEPLOY_SETTINGS:
                 raise DeploySettingsException("Invalid deploy_option {} "
-                                              "specified".format(option))
-
-        for required_setting in REQ_DEPLOY_SETTINGS:
-            if required_setting not in deploy_options:
-                self.deploy_settings['deploy_options'][required] = False
+                                              "specified".format(setting))
+            if setting == 'dataplane':
+                if value not in VALID_DATAPLANES:
+                    planes = ' '.join(VALID_DATAPLANES)
+                    raise DeploySettingsException(
+                        "Invalid dataplane {} specified. Valid dataplanes:"
+                        " {}".format(value, planes))
+
+        for req_set in REQ_DEPLOY_SETTINGS:
+            if req_set not in deploy_options:
+                if req_set == 'dataplane':
+                    self.deploy_settings['deploy_options'][req_set] = 'ovs'
+                else:
+                    self.deploy_settings['deploy_options'][req_set] = False
 
         if 'performance' in deploy_options:
             if not isinstance(deploy_options['performance'], dict):
                 raise DeploySettingsException("Performance deploy_option"
                                               "must be a dictionary.")
-            for role,role_perf_sets in deploy_options['performance'].items():
+            for role, role_perf_sets in deploy_options['performance'].items():
                 if role not in VALID_ROLES:
                     raise DeploySettingsException("Performance role {}"
                                                   "is not valid, choose"
                                                   "from {}".format(
-                                                  role," ".join(VALID_ROLES)
+                                                      role,
+                                                      " ".join(VALID_ROLES)
                                                   ))
 
                 for key in role_perf_sets:
                     if key not in VALID_PERF_OPTS:
-                        raise DeploySettingsException("Performance option {}"
+                        raise DeploySettingsException("Performance option {} "
                                                       "is not valid, choose"
                                                       "from {}".format(
-                                                      key," ".join(
-                                                      VALID_PERF_OPTS)))
-
+                                                          key,
+                                                          " ".join(
+                                                              VALID_PERF_OPTS)
+                                                      ))
 
     def _dump_performance(self):
         """
         Creates performance settings string for bash consumption.
 
-        Output will be in the form of a list that can be iterated over in bash,
-        with each string being the direct input to the performance setting script
-        in the form <role> <category> <key> <value> to facilitate modification of the
-        correct image.
+        Output will be in the form of a list that can be iterated over in
+        bash, with each string being the direct input to the performance
+        setting script in the form <role> <category> <key> <value> to
+        facilitate modification of the correct image.
         """
         bash_str = 'performance_options=(\n'
-        for role,settings in self.deploy_settings['deploy_options']['performance'].items():
-            for category,options in settings.items():
-                for key,value in options.items():
-                    bash_str += "\"{} {} {} {}\"\n".format(role, category, key, value)
+        deploy_options = self.deploy_settings['deploy_options']
+        for role, settings in deploy_options['performance'].items():
+            for category, options in settings.items():
+                for key, value in options.items():
+                    bash_str += "\"{} {} {} {}\"\n".format(role,
+                                                           category,
+                                                           key,
+                                                           value)
         bash_str += ')\n'
         bash_str += '\n'
         bash_str += 'performance_roles=(\n'
@@ -113,11 +133,13 @@ class DeploySettings:
         Creates deploy settings array in bash syntax.
         """
         bash_str = ''
-        for key,value in self.deploy_settings['deploy_options'].items():
+        for key, value in self.deploy_settings['deploy_options'].items():
             if not isinstance(value, bool):
-                bash_str += "deploy_options_array[{}]=\"{}\"\n".format(key, value)
+                bash_str += "deploy_options_array[{}]=\"{}\"\n".format(key,
+                                                                       value)
             else:
-                bash_str += "deploy_options_array[{}]={}\n".format(key, value)
+                bash_str += "deploy_options_array[{}]={}\n".format(key,
+                                                                   value)
         return bash_str
 
     def dump_bash(self, path=None):