diff options
| author |   Aleksandra Maciaga <aleksandra.maciaga@nokia.com> | 2020-04-01 13:14:14 +0200 |
|---|---|---|
| committer |   Pawel <pawel.kasperkiewicz@nokia.com> | 2020-04-02 15:16:54 +0200 |
| commit | 72ae9c392dd2c8493b3fbe50c491b4e0870caecf (patch) | |
| tree | b914e00a7d6eee2f8bae0e7e9337af89d4c994e7 /tests/dcaegen2/testcases/resources | |
| parent | 58cad3b81d9dd5c1e49e005bc2741e57802ea1a4 (diff) | |
Update VES Collector CSIT
Signed-off-by: Aleksandra Maciaga <aleksandra.maciaga@nokia.com>
Change-Id: I6dd9d36a7bddbbc3d0d99b72d990907e3fe87b1b
Issue-ID: DCAEGEN2-2182
Diffstat (limited to 'tests/dcaegen2/testcases/resources')
| -rw-r--r-- | tests/dcaegen2/testcases/resources/DMaaP.py | 10 | ||||
| -rw-r--r-- | tests/dcaegen2/testcases/resources/DcaeVariables.py | 2 | ||||
| -rw-r--r-- | tests/dcaegen2/testcases/resources/dcae_keywords.robot | 3 |
3 files changed, 8 insertions, 7 deletions
diff --git a/tests/dcaegen2/testcases/resources/DMaaP.py b/tests/dcaegen2/testcases/resources/DMaaP.py index 779397e4..500afd5d 100644 --- a/tests/dcaegen2/testcases/resources/DMaaP.py +++ b/tests/dcaegen2/testcases/resources/DMaaP.py @@ -119,7 +119,7 @@ class DMaaPHandler(BaseHTTPServer.BaseHTTPRequestHandler): global EvtSchema try: if EvtSchema is None: - with open(DcaeVariables.CommonEventSchemaV5) as opened_file: + with open(DcaeVariables.CommonEventSchema) as opened_file: EvtSchema = json.load(opened_file) decoded_body = json.loads(post_body) jsonschema.validate(decoded_body, EvtSchema) @@ -368,8 +368,8 @@ class DMaaPHandler(BaseHTTPServer.BaseHTTPRequestHandler): def test(handler_class=DMaaPHandler, server_class=BaseHTTPServer.HTTPServer, protocol="HTTP/1.0", port=3904): - print "Load event schema file: " + DcaeVariables.CommonEventSchemaV5 - with open(DcaeVariables.CommonEventSchemaV5) as opened_file: + print "Load event schema file: " + DcaeVariables.CommonEventSchema + with open(DcaeVariables.CommonEventSchema) as opened_file: global EvtSchema EvtSchema = json.load(opened_file) @@ -394,8 +394,8 @@ def _main_(handler_class=DMaaPHandler, server_class=BaseHTTPServer.HTTPServer, p else: port = 3904 - print "Load event schema file: " + DcaeVariables.CommonEventSchemaV5 - with open(DcaeVariables.CommonEventSchemaV5) as opened_file: + print "Load event schema file: " + DcaeVariables.CommonEventSchema + with open(DcaeVariables.CommonEventSchema) as opened_file: global EvtSchema EvtSchema = json.load(opened_file) diff --git a/tests/dcaegen2/testcases/resources/DcaeVariables.py b/tests/dcaegen2/testcases/resources/DcaeVariables.py index ac1eb9f5..84d06ae0 100644 --- a/tests/dcaegen2/testcases/resources/DcaeVariables.py +++ b/tests/dcaegen2/testcases/resources/DcaeVariables.py @@ -8,7 +8,7 @@ def get_environment_variable(env_varstr): DCAE_HEALTH_CHECK_URL = "http://135.205.228.129:8500" DCAE_HEALTH_CHECK_URL1 = "http://135.205.228.170:8500" -CommonEventSchemaV5 = get_environment_variable('WORKSPACE') + "/tests/dcaegen2/testcases/assets/json_events/CommonEventFormat_28.3.json" +CommonEventSchema = get_environment_variable('WORKSPACE') + "/tests/dcaegen2/testcases/assets/json_events/CommonEventFormat_30.1.1.json" HttpServerThread = None HTTPD = None diff --git a/tests/dcaegen2/testcases/resources/dcae_keywords.robot b/tests/dcaegen2/testcases/resources/dcae_keywords.robot index 0011ab88..89a87868 100644 --- a/tests/dcaegen2/testcases/resources/dcae_keywords.robot +++ b/tests/dcaegen2/testcases/resources/dcae_keywords.robot @@ -167,7 +167,8 @@ Send Request And Expect Error Run Healthcheck [Documentation] Run Healthcheck + [Arguments] ${session} ${uuid}= Generate UUID ${headers}= Create Dictionary Accept=*/* X-TransactionId=${GLOBAL_APPLICATION_ID}-${uuid} X-FromAppId=${GLOBAL_APPLICATION_ID} - ${resp}= Get Request ${http_session} /healthcheck headers=${headers} + ${resp}= Get Request ${session} /healthcheck headers=${headers} Should Be Equal As Strings ${resp.status_code} 200 |