Remove key file check

A check on the name of the ssh key file for user rapid has been removed.
We are now just using the name of the key file as it shows in the
rapid.env file. In the past, the file name was always replaced by a
hardcoded name for the rapid user.

Signed-off-by: Luc Provoost <luc.provoost@gmail.com>
Change-Id: Ie2219b33c75c54e937182e9307e16f290c82513e

diff --git a/VNFs/DPPD-PROX/helper-scripts/rapid/rapid_parser.py b/VNFs/DPPD-PROX/helper-scripts/rapid/rapid_parser.py
index 1a82671..aa7d01a 100644 (file)
--- a/VNFs/DPPD-PROX/helper-scripts/rapid/rapid_parser.py
+++ b/VNFs/DPPD-PROX/helper-scripts/rapid/rapid_parser.py
@@ -63,12 +63,6 @@ class RapidConfigParser(object):
         test_params['user'] = config.get('ssh', 'user')
         if config.has_option('ssh', 'key'):
             test_params['key'] = config.get('ssh', 'key')
-            if test_params['user'] in ['rapid']:
-                if test_params['key'] != 'rapid_rsa_key':
-                    RapidLog.debug(("Key file {} for user {} overruled by key file:"
-                            " rapid_rsa_key").format(test_params['key'],
-                            test_params['user']))
-                    test_params['key'] = 'rapid_rsa_key'
         else:
             test_params['key'] = None
         if config.has_option('ssh', 'password'):