diff options
author | RHE <rebirthmonkey@gmail.com> | 2017-12-18 18:37:37 +0100 |
---|---|---|
committer | Thomas Duval <thomas.duval@orange.com> | 2017-12-20 10:02:53 +0100 |
commit | 12d66121165397cc995e0f5a5873391c18279c0a (patch) | |
tree | 57ae937952230fa6a5d5eebf9c2fa50154789658 /moonv4/tests/utils/pdp.py | |
parent | 4894aee58df3e898c351f006d9d7648a7bb437ee (diff) |
fix moon functional tests
Change-Id: I9ebc0d8d20cca44a083d85a49587e7249a85b5bd
Signed-off-by: RHE <rebirthmonkey@gmail.com>
Diffstat (limited to 'moonv4/tests/utils/pdp.py')
-rw-r--r-- | moonv4/tests/utils/pdp.py | 34 |
1 files changed, 23 insertions, 11 deletions
diff --git a/moonv4/tests/utils/pdp.py b/moonv4/tests/utils/pdp.py index f3c6df37..50998507 100644 --- a/moonv4/tests/utils/pdp.py +++ b/moonv4/tests/utils/pdp.py @@ -2,17 +2,16 @@ import logging import requests import utils.config -config = utils.config.get_config_data() logger = logging.getLogger("moonforming.utils.policies") +URL = None +HEADER = None +KEYSTONE_USER = None +KEYSTONE_PASSWORD = None +KEYSTONE_PROJECT = None +KEYSTONE_SERVER = None + +# config = utils.config.get_config_data() -URL = "http://{}:{}".format( - config['components']['manager']['hostname'], - config['components']['manager']['port']) -HEADERS = {"content-type": "application/json"} -KEYSTONE_USER = config['openstack']['keystone']['user'] -KEYSTONE_PASSWORD = config['openstack']['keystone']['password'] -KEYSTONE_PROJECT = config['openstack']['keystone']['project'] -KEYSTONE_SERVER = config['openstack']['keystone']['url'] pdp_template = { "name": "test_pdp", @@ -22,8 +21,22 @@ pdp_template = { } -def get_keystone_projects(): +def init(consul_host, consul_port): + conf_data = utils.config.get_config_data(consul_host, consul_port) + global URL, HEADER, KEYSTONE_USER, KEYSTONE_PASSWORD, KEYSTONE_PROJECT, KEYSTONE_SERVER + URL = "http://{}:{}".format( + conf_data['manager_host'], + conf_data['manager_port']) + # URL = URL + "{}" + HEADER = {"content-type": "application/json"} + KEYSTONE_USER = conf_data['keystone_user'] + KEYSTONE_PASSWORD = conf_data['keystone_password'] + KEYSTONE_PROJECT = conf_data['keystone_project'] + KEYSTONE_SERVER = conf_data['keystone_host'] + +def get_keystone_projects(): + global HEADERS HEADERS = { "Content-Type": "application/json" } @@ -160,4 +173,3 @@ def delete_pdp(pdp_id): assert type(result) is dict assert "result" in result assert result["result"] - |