Merge "Add DT Jenkins job test"
diff --git a/cvp_checks/tests/test_contrail.py b/cvp_checks/tests/test_contrail.py
index 2d358e9..5e7e108 100644
--- a/cvp_checks/tests/test_contrail.py
+++ b/cvp_checks/tests/test_contrail.py
@@ -4,7 +4,7 @@
pytestmark = pytest.mark.usefixtures("contrail")
STATUS_FILTER = r'grep -Pv "(==|^$|Disk|unix|support|boot|\*\*|FOR NODE)"'
-STATUS_COMMAND = "contrail-status"
+STATUS_COMMAND = "contrail-status -t 10"
def get_contrail_status(salt_client, pillar, command, processor):
return salt_client.cmd(
diff --git a/cvp_checks/utils/__init__.py b/cvp_checks/utils/__init__.py
index 6ad3a6d..91501a8 100644
--- a/cvp_checks/utils/__init__.py
+++ b/cvp_checks/utils/__init__.py
@@ -12,7 +12,10 @@
class salt_remote:
def cmd(self, tgt, fun, param=None, expr_form=None, tgt_type=None):
config = get_configuration()
- url = config['SALT_URL']
+ url = config['SALT_URL'].strip()
+ if not re.match("^(http|https)://", url):
+ raise AuthenticationError("Salt URL should start \
+ with http or https, given - {}".format(url))
proxies = {"http": None, "https": None}
headers = {'Accept': 'application/json'}
login_payload = {'username': config['SALT_USERNAME'],