From 80c9d45b62d7f1b4adf5b7863b9ef1de4b1923f9 Mon Sep 17 00:00:00 2001
From: garciay <yann.garcia@fscom.fr>
Date: Thu, 8 Aug 2019 14:54:40 +0200
Subject: [PATCH] Merge with MEC 021 work

---
 SRV/RNIS/RnisQuery_BV.robot                   |  4 +-
 SRV/RNIS/RnisSpecificSubscription_BI_BO.robot |  4 +-
 SRV/RNIS/RnisSpecificSubscription_BV.robot    |  4 +-
 SRV/RNIS/resources/GenericKeywords.robot      | 44 -------------------
 pics.txt                                      |  5 ++-
 5 files changed, 9 insertions(+), 52 deletions(-)
 delete mode 100644 SRV/RNIS/resources/GenericKeywords.robot

diff --git a/SRV/RNIS/RnisQuery_BV.robot b/SRV/RNIS/RnisQuery_BV.robot
index 145757f..f720677 100644
--- a/SRV/RNIS/RnisQuery_BV.robot
+++ b/SRV/RNIS/RnisQuery_BV.robot
@@ -3,8 +3,8 @@
 
 *** Settings ***
 Resource    environment/variables.txt
-Resource    environment/pics.txt
-Resource    resources/GenericKeywords.robot
+Resource    ../../pics.txt
+Resource    ../../GenericKeywords.robot
 Resource    resources/RadioNetworkInformationAPI.robot
 Library     REST    ${MEC-APP_SCHEMA}://${MEC-APP_HOST}:${MEC-APP_PORT}    ssl_verify=false
 
diff --git a/SRV/RNIS/RnisSpecificSubscription_BI_BO.robot b/SRV/RNIS/RnisSpecificSubscription_BI_BO.robot
index a8874ab..d0ddb2a 100644
--- a/SRV/RNIS/RnisSpecificSubscription_BI_BO.robot
+++ b/SRV/RNIS/RnisSpecificSubscription_BI_BO.robot
@@ -3,8 +3,8 @@
 
 *** Settings ***
 Resource    environment/variables.txt
-Resource    environment/pics.txt
-Resource    resources/GenericKeywords.robot
+Resource    ../../pics.txt
+Resource    ../../GenericKeywords.robot
 Resource    resources/RadioNetworkInformationAPI.robot
 Library     REST    ${MEC-APP_SCHEMA}://${MEC-APP_HOST}:${MEC-APP_PORT}    ssl_verify=false
 
diff --git a/SRV/RNIS/RnisSpecificSubscription_BV.robot b/SRV/RNIS/RnisSpecificSubscription_BV.robot
index d0c3876..4c3dfc7 100644
--- a/SRV/RNIS/RnisSpecificSubscription_BV.robot
+++ b/SRV/RNIS/RnisSpecificSubscription_BV.robot
@@ -3,8 +3,8 @@
 
 *** Settings ***
 Resource    environment/variables.txt
-Resource    environment/pics.txt
-Resource    resources/GenericKeywords.robot
+Resource    ../../pics.txt
+Resource    ../../GenericKeywords.robot
 Resource    resources/RadioNetworkInformationAPI.robot
 Library     REST    ${MEC-APP_SCHEMA}://${MEC-APP_HOST}:${MEC-APP_PORT}    ssl_verify=false
 
diff --git a/SRV/RNIS/resources/GenericKeywords.robot b/SRV/RNIS/resources/GenericKeywords.robot
deleted file mode 100644
index 800dc5d..0000000
--- a/SRV/RNIS/resources/GenericKeywords.robot
+++ /dev/null
@@ -1,44 +0,0 @@
-*** Settings ***
-Resource    ../environment/variables.txt
-Resource    GenericKeywords.robot
-Library    REST    ${MEC-APP_SCHEMA}://${MEC-APP_HOST}:${MEC-APP_PORT}    ssl_verify=false
-Library    JSONSchemaLibrary    schemas/
-
-*** Keywords ***
-Get User Equipment for location with filters
-    [Arguments]    ${value}
-    Set Headers  {"Accept":"application/json"}
-    Get    /location/v2/users/${value}
-    ${output}=    Output    response
-    Set Suite Variable    ${response}    ${output}
-
-Check HTTP Response Status Code Is
-    [Arguments]    ${expected_status}
-    ${status}=    Convert To Integer    ${expected_status}
-    Should Be Equal    ${response['status']}    ${status}
-    Log    Status code validated
-
-Check HTTP Response Body Json Schema Is
-    [Arguments]    ${input}
-    Should Contain    ${response['headers']['Content-Type']}    application/json
-    ${schema} =    Catenate    SEPARATOR=    ${input}    .schema.json
-    Validate Json    ${schema}    ${response['body']}
-    Log    Json Schema Validation OK
-
-Should Be Present In Json List
-    [Arguments]     ${expr}   ${json_field}   ${json_value}
-    Log    Check if ${json_field} is present in ${expr} with the value ${jsonvalue}
-    :FOR  ${item}  IN  @{expr}
-    \  Exit For Loop If    "${item['${json_field}']}" == "${json_value}"
-    Log    Item found ${item}
-    [return]    ${item}
-
-Check Result Contains
-    [Arguments]    ${source}    ${parameter}    ${value}
-    Should Be Present In Json List    ${source}    ${parameter}    ${value}
-
-Check ProblemDetails
-    [Arguments]    ${expected_status}
-    ${status}=    Convert To Integer    ${expected_status}
-    Should Be Equal    ${response['body']['problemDetails']['status']}    ${status}
-    Log    ProblemDetails Status code validated
diff --git a/pics.txt b/pics.txt
index 0d3c35c..2c74d7a 100644
--- a/pics.txt
+++ b/pics.txt
@@ -1,6 +1,7 @@
 *** Variables ***
 
-${PIC_MEC_PLAT}        1 
+${PIC_MEC_PLAT}        1
 ${PIC_SERVICES}        1
 ${PIC_RNIS_QUERY}      1
-${PIC_AMS}             1
\ No newline at end of file
+${PIC_RNIS_SPECIFIC_SUBSCRIPTION}    1
+${PIC_AMS}             1
-- 
GitLab