replace vault ref separator

- replace ":" to "=" as vault separator
(vault|engine=secret|path=fake_path|attr=attr_name).
- Add functional job

Author: gtema

.zuul.yaml

@@ -31,13 +31,16 @@
       jobs:
         - otc-tox-pep8
         - otc-tox-py38
+        - otc-tox-functional
         - apimon-build-image
     check-post:
       jobs:
         - apimon-upload-image
     gate:
       jobs:
         - otc-tox-pep8
+        - otc-tox-py38
+        - otc-tox-functional
         - apimon-upload-image
     release:
       jobs:

apimon/lib/utils.py

@@ -56,7 +56,7 @@ def expand_vars(value, vault_client=None):
         return value
     try:
         pairs = value.split('|')
-        dt = {k: v for k, v in [x.split(':') for x in pairs[1:]]}
+        dt = {k: v for k, v in [x.split('=') for x in pairs[1:]]}
         if dt['engine'] == 'secret':
             data = vault_client.secrets.kv.v2.read_secret(
                 path=dt['path']

apimon/tests/functional/lib/test_config.py

@@ -49,8 +49,8 @@ def test_get_cloud_with_vault(self):
                 name='vault_cloud',
                 data=dict(
                     auth=dict(
-                        username="vault|engine:secret|path:usr1|attr:username",
-                        password="vault|engine:secret|path:usr1|attr:password"
+                        username="vault|engine=secret|path=usr1|attr=username",
+                        password="vault|engine=secret|path=usr1|attr=password"
                     )
                 )
             )

apimon/tests/functional/lib/test_utils.py

@@ -33,7 +33,7 @@ def test_expand_vars_vault(self):
         self.assertEqual(
             'bar',
             utils.expand_vars(
-                'vault|engine:secret|path:usr1|attr:password',
+                'vault|engine=secret|path=usr1|attr=password',
                 vault_client)
         )
 
@@ -55,9 +55,9 @@ def test_expand_dict(self):
             )
         )
         struct = {
-            'foo': 'vault|engine:secret|path:fake|attr:foo',
+            'foo': 'vault|engine=secret|path=fake|attr=foo',
             'inline': {
-                'foo2': 'vault|engine:secret|path:fake2|attr:foo'
+                'foo2': 'vault|engine=secret|path=fake2|attr=foo'
             }
         }
 

apimon/tests/unit/executor/test_server.py

@@ -315,7 +315,7 @@ def __get_cloud_config(self, job):
             json.dumps({
                 '_version': 0,
                 'clouds': {
-                    'a': 'vault|engine:secret|path:fake|attr:foo'
+                    'a': 'vault|engine=secret|path=fake|attr=foo'
                 }
             })
         )

apimon/tests/unit/lib/test_utils.py

@@ -47,6 +47,6 @@ def test_expand_vars_vault(self):
             self.assertEqual(
                 'bar',
                 utils.expand_vars(
-                    'vault|engine:secret|path:fake_path|attr:attr_name',
+                    'vault|engine=secret|path=fake_path|attr=attr_name',
                     fake_client)
             )

etc/apimon.yaml

@@ -41,7 +41,7 @@ clouds:
         auth_url: https://my_url
         project_name: test_proj
         user_domain_name: TEST_DOMAIN
-        username: "vault|engine:secrets|path:path|attr:attr"
+        username: "vault|engine=secrets|path=path|attr=attr"
         password: password
       additional_metric_tags:
         environment: production

etc/secure.yaml

@@ -1,8 +1,6 @@
 ---
 vault:
   addr: http://localhost:8200
-    #  role_id: some_role
-    #secret_id: "top_secret!123"
   token: "root"
 additional_vars:
   foo: bar

tox.ini

@@ -1,7 +1,7 @@
 [tox]
-minversion = 3.6
+minversion = 3.8
 skipsdist = True
-envlist = pep8,py37
+envlist = pep8,py39
 ignore_basepython_conflict = True
 
 [testenv]
@@ -18,6 +18,12 @@ deps =
 commands = stestr run {posargs}
            stestr slowest
 
+[testenv:functional]
+setenv =
+    {[testenv]setenv}
+commands = stestr --test-path ./apimon/tests/functional/ run --serial {posargs}
+           stestr slowest
+
 [testenv:pep8]
 install_command = pip install {opts} {packages}
 commands =