X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=functest%2Futils%2Fenv.py;h=26efbb196acd739c719f45ee2146c75e87b72c26;hb=6b0fa7ecb5aa0c0dead1d16c2811f5c47347a091;hp=aa2da0b541984d88e9ecf303ff338d73d1bb4fdc;hpb=5d6cce702590f6bcf340a99343edba8c251534e1;p=functest.git diff --git a/functest/utils/env.py b/functest/utils/env.py index aa2da0b54..26efbb196 100644 --- a/functest/utils/env.py +++ b/functest/utils/env.py @@ -12,20 +12,31 @@ import os import prettytable +from xtesting.utils import env INPUTS = { 'EXTERNAL_NETWORK': None, - 'CI_LOOP': 'daily', - 'DEPLOY_SCENARIO': 'os-nosdn-nofeature-noha', - 'INSTALLER_TYPE': None, + 'CI_LOOP': env.INPUTS['CI_LOOP'], + 'DEPLOY_SCENARIO': env.INPUTS['DEPLOY_SCENARIO'], + 'INSTALLER_TYPE': env.INPUTS['INSTALLER_TYPE'], 'SDN_CONTROLLER_IP': None, - 'BUILD_TAG': None, - 'NODE_NAME': None, + 'SDN_CONTROLLER_USER': 'admin', + 'SDN_CONTROLLER_PASSWORD': 'admin', + 'SDN_CONTROLLER_WEBPORT': '8080', + 'SDN_CONTROLLER_RESTCONFPORT': '8181', + 'BUILD_TAG': env.INPUTS['BUILD_TAG'], + 'NODE_NAME': env.INPUTS['NODE_NAME'], 'POD_ARCH': None, - 'TEST_DB_URL': 'http://testresults.opnfv.org/test/api/v1/results', - 'ENERGY_RECORDER_API_URL': 'http://energy.opnfv.fr/resources', - 'ENERGY_RECORDER_API_USER': None, - 'ENERGY_RECORDER_API_PASSWORD': None + 'TEST_DB_URL': env.INPUTS['TEST_DB_URL'], + 'ENERGY_RECORDER_API_URL': env.INPUTS['ENERGY_RECORDER_API_URL'], + 'ENERGY_RECORDER_API_USER': env.INPUTS['ENERGY_RECORDER_API_USER'], + 'ENERGY_RECORDER_API_PASSWORD': env.INPUTS['ENERGY_RECORDER_API_PASSWORD'], + 'VOLUME_DEVICE_NAME': 'vdb', + 'IMG_PROP': '', + 'NAMESERVER': '8.8.8.8', + 'NEW_USER_ROLE': 'Member', + 'USE_DYNAMIC_CREDENTIALS': 'True', + 'STORAGE_PROTOCOL': 'iSCSI' }