Commit 7a48c496 authored by Stavros-Anastasios Charismiadis's avatar Stavros-Anastasios Charismiadis
Browse files

Merge branch 'OCF225-fix-tests' into 'OCF221-improve-interconnection-api' 

Resolve "Fix tests"

See merge request !200
parents 82f914fb 3ed0e449

helm/scripts/run_remote_capif_tests.sh

+1 −1
Original line number Diff line number Diff line
@@ -52,7 +52,7 @@ INPUT_OPTIONS=$@ 
# Check if input is provided

if [ -z "$1" ]; then

    # Set default value if no input is provided

    INPUT_OPTIONS="--include all"

    INPUT_OPTIONS="--include all --exclude interconnection"

fi



cd $CAPIF_BASE_DIR

services/register/config.yaml

+20 −22
Original line number Diff line number Diff line 
mongo: {

  'user': 'root',

  'password': 'example',

  'db': 'capif_users',

  'col': 'user',

  'col_capif_configuration': "capif_configuration",

  'admins': 'admins',

  'host': 'mongo_register',

  'port': '27017'

}

mongo:

  user: "root"

  password: "example"

  db: "capif_users"

  col: "user"

  col_capif_configuration: "capif_configuration"

  admins: "admins"

  host: "mongo_register"

  port: "27017"



ca_factory:

  url: !ENV ${VAULT_HOSTNAME}
@@ -16,18 +15,17 @@ ca_factory: 
  verify: False





ccf: {

  "url": "capifcore",

  "helper_remove_user": "/helper/deleteEntities/"

}

ccf:

  url: !ENV ${CAPIF_HOSTNAME}

  helper_remove_user: "/helper/deleteEntities/"



register: {

  "register_uuid": '6ba7b810-9dad-11d1-80b4-00c04fd430c8',

  "refresh_expiration": 30, #days

  "token_expiration": 10, #mins

  "admin_users": {admin_user: "admin",

                admin_pass: "password123"}

}

register:

  register_uuid: '6ba7b810-9dad-11d1-80b4-00c04fd430c8'

  refresh_expiration: 30 #days

  token_expiration: 10 #mins

  admin_users:

    admin_user: "admin"

    admin_pass: "password123"



capif_configuration:

  config_description: Default Register Configuration

services/run_capif_tests.sh

+1 −1
Original line number Diff line number Diff line
@@ -121,7 +121,7 @@ INPUT_OPTIONS=$@ 
# Check if input is provided

if [ -z "$1" ]; then

    # Set default value if no input is provided

    INPUT_OPTIONS="--include all"

    INPUT_OPTIONS="--include all --exclude interconnection"

fi



docker >/dev/null 2>/dev/null

tests/features/Helper/Interconnection API/interconnection.robot

+23 −3
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ Interconnection 2 CCF 


    ${DESTINATION_PROVIDER_DOMAIN}=    Set Variable    capifcore-b:1443



    ${ccf_id}=    Get Capif Ccf Id

    ${ccf_id_a}=    Get Capif Ccf Id



    ${body}=    Create Interconnection Request Body    ${DESTINATION_PROVIDER_DOMAIN}

    ${resp}=    Post Request Capif
@@ -37,12 +37,23 @@ Interconnection 2 CCF 
    Should Be Equal As Integers    ${resp.status_code}    201

    Log Dictionary    ${resp.json()}



    ${ccf_id_b}=   Set Variable    ${resp.json()['ccfId']}



    # Delete interconnection

    ${resp}=    Delete Request Capif

    ...    /helper/interconnection/request/${ccf_id_b}

    ...    server=${CAPIF_HTTPS_URL}

    ...    verify=ca.crt

    ...    username=${SUPERADMIN_USERNAME}



    Should Be Equal As Integers    ${resp.status_code}    204



Interconnection 2 CCF X

    [Tags]    interconnection-2



    ${DESTINATION_PROVIDER_DOMAIN}=    Set Variable    capifcore-b:1443



    ${ccf_id}=    Get Capif Ccf Id

    ${ccf_id_a}=    Get Capif Ccf Id



    ${ccf_crt}=    Read File Utf8    ${CCF_USERNAME}.crt

    ${ccf_key}=    Read File Utf8    ${CCF_USERNAME}.key
@@ -50,7 +61,7 @@ Interconnection 2 CCF X 


    ${body}=    Create Connection Request Body

    ...    ${ccf_ca}

    ...    ${ccf_id}

    ...    ${ccf_id_a}

    ...    ${DESTINATION_PROVIDER_DOMAIN}

    ...    ${ccf_crt}

    ${resp}=    Post Request Capif
@@ -62,3 +73,12 @@ Interconnection 2 CCF X 


    Should Be Equal As Integers    ${resp.status_code}    201

    Log Dictionary    ${resp.json()}



    # Delete interconnection

    ${resp}=    Delete Request Capif

    ...    /helper/interconnection/establish/${ccf_id_a}

    ...    server=${CAPIF_HTTPS_URL}

    ...    verify=ca.crt

    ...    username=${CCF_USERNAME}



    Should Be Equal As Integers    ${resp.status_code}    204