commit 35413c0724ce8e70465400ae7bbf5056e17e5510
author Dmitry Tyzhnenko <t.dmitry@gmail.com> Mon Mar 05 14:12:37 2018 +0200
committer Dmitry Tyzhnenko <t.dmitry@gmail.com> Thu May 31 13:40:07 2018 +0300
tree 8f02ed4836f40183b8853b2b722ad068d6146868
parent 6111511ab86962c8524c3fd7807b492e31c52a19

Use MaaS in system tests

Change-Id: Ibaa90ab8a5f290c2a076976243ec0d2511ce8295

tcp_tests/settings_oslo.py

diff --git a/tcp_tests/settings_oslo.py b/tcp_tests/settings_oslo.py
index 062e421..8ba9f4d 100644
--- a/tcp_tests/settings_oslo.py
+++ b/tcp_tests/settings_oslo.py
@@ -67,7 +67,13 @@
     __name__, 'templates/{0}/k8s.yaml'.format(
         settings.LAB_CONFIG_NAME))
 _default_net_mgm = os.environ.get("NET_MGMT", "admin-pool01")
-
+_default_configure_steps = pkg_resources.resource_filename(
+    __name__, 'templates/{0}/cfg01_configure.yaml'.format(
+        settings.LAB_CONFIG_NAME))
+# _default_cluster_maas_config = pkg_resources.resource_filename(
+#     __name__, 'templates/{0}/cluster_infra_maas.yml'.format(
+#         settings.LAB_CONFIG_NAME))
+_default_cluster_maas_config = 'cluster_infra_maas.yml'
 
 hardware_opts = [
     ct.Cfg('manager', ct.String(),
@@ -352,6 +358,38 @@
                    'kubernetes/k8s-conformance:v1.8.13-11')
 ]
 
+day1_cfg_config_opts = [
+    ct.Cfg('configure_steps_path', ct.String(),
+           help="Path to YAML with steps to config cfg01 node",
+           default=_default_configure_steps),
+    ct.Cfg('environment_template_dir', ct.String(),
+           help="Path to directory with Environment template and inventory",
+           default=_default_environment_template_dir),
+    ct.Cfg('templates_dir', ct.String(),
+           help="Path to directory with templates",
+           default=_default_templates_dir),
+    ct.Cfg('cluster_maas_config', ct.String(),
+           help="Path to maas class yaml file for cfg node",
+           default=_default_cluster_maas_config),
+    ct.Cfg('maas_machines_macs', ct.JSONDict(),
+           help="""MAC of machines interfaces for maas config:
+                  'parameters': {
+                    'maas' : {
+                      'region' : {
+                        'machines': {
+                          'ctl01': {
+                            'interface': {
+                              'mac': 'aa:bb:cc:dd:ee:ff'
+                            }
+                          }
+                          '...': {
+                            'interface': {
+                              'mac': 'aa:bb:cc:dd:ee:ff'
+                            }
+                          }
+                  }}}}""", default={}),
+]
+
 _group_opts = [
     ('hardware', hardware_opts),
     ('underlay', underlay_opts),
@@ -374,6 +412,8 @@
     ('ceph_deploy', ceph_deploy_opts),
     ('k8s_deploy', k8s_deploy_opts),
     ('k8s', k8s_opts),
+    ('day1_cfg_config', day1_cfg_config_opts),
+    ('day1_underlay', underlay_opts),
 ]
 
 
@@ -472,6 +512,14 @@
                      help=""))
     config.register_opts(group='ceph_deploy', opts=ceph_deploy_opts)
 
+    config.register_group(cfg.OptGroup(name='day1_cfg_config',
+                          title="Day01 config node configuration", help=""))
+    config.register_opts(group='day1_cfg_config', opts=day1_cfg_config_opts)
+
+    config.register_group(cfg.OptGroup(name='day1_underlay',
+                          title="Day01 underlay configuration", help=""))
+    config.register_opts(group='day1_underlay', opts=underlay_opts)
+
     return config