Merge pull request #87 from telefonicaid/hardening/pep_auth_token_sup…

…port Add support for Pep Proxy in acceptance tests
telefonicaid · Nov 29, 2016 · 32ab055 · 32ab055
2 parents 8f5ebce + d6a0b7f
commit 32ab055
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 13 deletions.
diff --git a/ngsi_adapter/test/acceptance/commons/constants.py b/ngsi_adapter/test/acceptance/commons/constants.py
@@ -63,6 +63,7 @@
 MONITORING_CONFIG_SERVICE_PROTOCOL = "protocol"
 MONITORING_CONFIG_SERVICE_HOST = "host"
 MONITORING_CONFIG_SERVICE_PORT = "port"
+MONITORING_CONFIG_SERVICE_AUTH_TOKEN = "pep_auth_token"
 MONITORING_CONFIG_SERVICE_RESOURCE = "resource"
 MONITORING_CONFIG_SERVICE_PRIVATEKEY = "private_key_location"
 MONITORING_CONFIG_SERVICE_HOSTUSER = "host_user"

diff --git a/ngsi_adapter/test/acceptance/commons/ngsi_adapter_api_utils/ngsi_adapter_client.py b/ngsi_adapter/test/acceptance/commons/ngsi_adapter_api_utils/ngsi_adapter_client.py
@@ -25,9 +25,10 @@
 
 
 from commons.rest_client_utils import RestClient, API_ROOT_URL_ARG_NAME
-from commons.constants import HEADER_REPRESENTATION_TEXTPLAIN, HEADER_CONTENT_TYPE, HEADER_CORRELATOR, HTTP_VERB_POST
 from commons.utils import generate_correlator
 from commons.logger_utils import get_logger
+from commons.constants import HEADER_REPRESENTATION_TEXTPLAIN, HEADER_CONTENT_TYPE, HEADER_CORRELATOR, HTTP_VERB_POST, \
+    HEADER_AUTH_TOKEN
 
 NGSI_ADAPTER_URI_BASE = "{" + API_ROOT_URL_ARG_NAME + "}"
 NGSI_ADAPTER_URI_PARSER = NGSI_ADAPTER_URI_BASE + "/{probe_name}"
@@ -41,24 +42,27 @@ class NgsiAdapterClient:
 
     headers = dict()
 
-    def __init__(self, protocol, host, port, base_resource=None):
+    def __init__(self, protocol, host, port, base_resource=None, auth_token=None):
         """
         Class constructor. Init default headers
         :param protocol: API Protocol
         :param host: API Host
         :param port: API Port
         :param base_resource: base uri resource (if exists)
+        :param auth_token: Pep Proxy auth token (only if required)
         :return: None
         """
 
-        self.init_headers()
+        self.init_headers(auth_token=auth_token)
         self.rest_client = RestClient(protocol, host, port, base_resource)
 
-    def init_headers(self, content_type=HEADER_REPRESENTATION_TEXTPLAIN, correlator=generate_correlator()):
+    def init_headers(self, content_type=HEADER_REPRESENTATION_TEXTPLAIN, correlator=generate_correlator(),
+                     auth_token=None):
         """
         Init header to values (or default values)
         :param content_type: Content-Type header value. By default text/plain
         :param correlator: correlator header value. By default, generated value by utils.generate_correlator()
+        :param auth_token: Pep Proxy auth token (only if required)
         :return: None
         """
 
@@ -74,6 +78,12 @@ def init_headers(self, content_type=HEADER_REPRESENTATION_TEXTPLAIN, correlator=
         else:
             self.headers.update({HEADER_CORRELATOR: correlator})
 
+        if auth_token is None:
+            if HEADER_AUTH_TOKEN in self.headers:
+                del(self.headers[HEADER_AUTH_TOKEN])
+        else:
+            self.headers.update({HEADER_AUTH_TOKEN: auth_token})
+
     def set_headers(self, headers):
         """
         Set header.

diff --git a/ngsi_adapter/test/acceptance/features/component/send_data/terrain.py b/ngsi_adapter/test/acceptance/features/component/send_data/terrain.py
@@ -29,7 +29,7 @@
 from commons.ngsi_adapter_api_utils.ngsi_adapter_client import NgsiAdapterClient
 from commons.logger_utils import get_logger
 from commons.constants import MONITORING_CONFIG_SERVICE_ADAPTER, MONITORING_CONFIG_SERVICE_HOST, \
-    MONITORING_CONFIG_SERVICE_PORT, MONITORING_CONFIG_SERVICE_PROTOCOL
+    MONITORING_CONFIG_SERVICE_PORT, MONITORING_CONFIG_SERVICE_PROTOCOL, MONITORING_CONFIG_SERVICE_AUTH_TOKEN
 
 logger = get_logger("terrain_utils")
 
@@ -41,12 +41,14 @@ def before_all():
 
 @before.each_feature
 def before_each_feature(feature):
+    auth_token = world.config[MONITORING_CONFIG_SERVICE_ADAPTER][MONITORING_CONFIG_SERVICE_AUTH_TOKEN]
     world.ngsi_adapter_client = NgsiAdapterClient(world.config[MONITORING_CONFIG_SERVICE_ADAPTER]
                                                   [MONITORING_CONFIG_SERVICE_PROTOCOL],
                                                   world.config[MONITORING_CONFIG_SERVICE_ADAPTER]
                                                   [MONITORING_CONFIG_SERVICE_HOST],
                                                   world.config[MONITORING_CONFIG_SERVICE_ADAPTER]
-                                                  [MONITORING_CONFIG_SERVICE_PORT])
+                                                  [MONITORING_CONFIG_SERVICE_PORT],
+                                                  auth_token=auth_token)
 
 
 @before.each_scenario

diff --git a/ngsi_adapter/test/acceptance/settings/dev-properties.json b/ngsi_adapter/test/acceptance/settings/dev-properties.json
@@ -9,23 +9,24 @@
     },
     "monitoring_adapter_service": {
         "protocol": "http",
-        "host": "130.206.81.245",
+        "host": "<publicIP>",
         "port": "1337",
+        "pep_auth_token": "<authToken>",
         "resource": "",
-        "host_user": "root",
+        "host_user": "centos",
         "host_password": "",
-        "private_key_location": "./fiware_cloud_dsa",
+        "private_key_location": "<pemFile>",
         "service_log_path": "/var/log/ngsi_adapter/",
         "service_log_file_name": "ngsi_adapter.log"
     },
     "monitoring_nagios": {
-        "host": "130.206.81.243",
-        "host_user": "root",
+        "host": "<privateIP>",
+        "host_user": "centos",
         "host_password": ""
     },
     "monitoring_remote_host": {
-        "host": "130.206.81.246",
-        "host_user": "root",
+        "host": "<privateIP>",
+        "host_user": "ubuntu",
         "host_password": ""
     }
 }