diff options
| -rw-r--r-- | html/index.html | 2 | ||||
| -rw-r--r-- | robot/assets/templates/web/index.html.jinja | 2 | ||||
| -rw-r--r-- | robot/resources/aai/aai_interface.robot | 2 | ||||
| -rw-r--r-- | robot/resources/appc_interface.robot | 6 | ||||
| -rw-r--r-- | robot/testsuites/update_onap_page.robot | 3 |
5 files changed, 6 insertions, 9 deletions
diff --git a/html/index.html b/html/index.html index f3571dac..7110a202 100644 --- a/html/index.html +++ b/html/index.html @@ -84,7 +84,7 @@ GLOBAL_INJECTED_OPENSTACK_USERNAME = "openstackuser" GLOBAL_INJECTED_OPENSTACK_TENANT_ID = "d570c718cbc545029f40e50b75eb13df" GLOBAL_INJECTED_REGION = "RegionOne" GLOBAL_INJECTED_KEYSTONE = "http://10.12.25.2:5000" -GLOBAL_INJECTED_AAI1_IP_ADDR = "aai.onap" +GLOBAL_INJECTED_AAI_IP_ADDR = "aai.onap" GLOBAL_INJECTED_APPC_IP_ADDR = "appc.onap" GLOBAL_INJECTED_DCAE_IP_ADDR = "dcae-healthcheck.onap" GLOBAL_INJECTED_SO_IP_ADDR = "so.onap" diff --git a/robot/assets/templates/web/index.html.jinja b/robot/assets/templates/web/index.html.jinja index a48181a0..412e1a8d 100644 --- a/robot/assets/templates/web/index.html.jinja +++ b/robot/assets/templates/web/index.html.jinja @@ -85,7 +85,7 @@ GLOBAL_INJECTED_OPENSTACK_USERNAME = "openstackuser" GLOBAL_INJECTED_OPENSTACK_TENANT_ID = "{{GLOBAL_INJECTED_OPENSTACK_TENANT_ID}}" GLOBAL_INJECTED_REGION = "{{GLOBAL_INJECTED_REGION}}" GLOBAL_INJECTED_KEYSTONE = "{{GLOBAL_INJECTED_KEYSTONE}}" -GLOBAL_INJECTED_AAI1_IP_ADDR = "{{aai1}}" +GLOBAL_INJECTED_AAI_IP_ADDR = "{{aai1}}" GLOBAL_INJECTED_APPC_IP_ADDR = "{{appc}}" GLOBAL_INJECTED_DCAE_IP_ADDR = "{{dcae_controller}}" GLOBAL_INJECTED_SO_IP_ADDR = "{{so}}" diff --git a/robot/resources/aai/aai_interface.robot b/robot/resources/aai/aai_interface.robot index 0ed127e2..d43f35c4 100644 --- a/robot/resources/aai/aai_interface.robot +++ b/robot/resources/aai/aai_interface.robot @@ -8,7 +8,7 @@ Resource ../global_properties.robot *** Variables *** ${AAI_HEALTH_PATH} /aai/util/echo?action=long ${VERSIONED_INDEX_PATH} /aai/v11 -${AAI_FRONTEND_ENDPOINT} ${GLOBAL_AAI_SERVER_PROTOCOL}://${GLOBAL_INJECTED_AAI1_IP_ADDR}:${GLOBAL_AAI_SERVER_PORT} +${AAI_FRONTEND_ENDPOINT} ${GLOBAL_AAI_SERVER_PROTOCOL}://${GLOBAL_INJECTED_AAI_IP_ADDR}:${GLOBAL_AAI_SERVER_PORT} *** Keywords *** diff --git a/robot/resources/appc_interface.robot b/robot/resources/appc_interface.robot index 7ae27c72..b031aab4 100644 --- a/robot/resources/appc_interface.robot +++ b/robot/resources/appc_interface.robot @@ -30,9 +30,8 @@ Run APPC Health Check Run APPC Post Request [Documentation] Runs an APPC post request [Arguments] ${data_path} ${data} ${content}=json - ${auth}= Create List ${GLOBAL_APPC_USERNAME} ${GLOBAL_APPC_PASSWORD} Log Creating session ${APPC_ENDPOINT} - ${session}= Create Session appc ${APPC_ENDPOINT} auth=${auth} + ${session}= Create Session appc ${APPC_ENDPOINT} auth=${GLOBAL_APPC_AUTHENTICATION} ${uuid}= Generate UUID4 ${headers}= Create Dictionary Accept=application/${content} Content-Type=application/${content} X-TransactionId=${GLOBAL_APPLICATION_ID}-${uuid} X-FromAppId=${GLOBAL_APPLICATION_ID} ${resp}= Post Request appc ${data_path} data=${data} headers=${headers} @@ -42,9 +41,8 @@ Run APPC Post Request Run APPC Put Request [Documentation] Runs an APPC post request [Arguments] ${data_path} ${data} ${content}=xml - ${auth}= Create List ${GLOBAL_APPC_USERNAME} ${GLOBAL_APPC_PASSWORD} Log Creating session ${APPC_ENDPOINT} - ${session}= Create Session appc ${APPC_ENDPOINT} auth=${auth} + ${session}= Create Session appc ${APPC_ENDPOINT} auth=${GLOBAL_APPC_AUTHENTICATION} ${uuid}= Generate UUID4 ${headers}= Create Dictionary Accept=application/${content} Content-Type=application/${content} X-TransactionId=${GLOBAL_APPLICATION_ID}-${uuid} X-FromAppId=${GLOBAL_APPLICATION_ID} ${resp}= Put Request appc ${data_path} data=${data} headers=${headers} diff --git a/robot/testsuites/update_onap_page.robot b/robot/testsuites/update_onap_page.robot index 54778e01..f784a728 100644 --- a/robot/testsuites/update_onap_page.robot +++ b/robot/testsuites/update_onap_page.robot @@ -29,8 +29,7 @@ Update ONAP Page ${server_map}= Get Openstack Servers auth ${oam_ip_map}= Create Dictionary Set To Dictionary ${oam_ip_map} 10.0.0.1=onapdns - Set To Dictionary ${oam_ip_map} ${GLOBAL_INJECTED_AAI1_IP_ADDR}=aai1 - Set To Dictionary ${oam_ip_map} ${GLOBAL_INJECTED_AAI2_IP_ADDR}=aai2 + Set To Dictionary ${oam_ip_map} ${GLOBAL_INJECTED_AAI_IP_ADDR}=aai1 Set To Dictionary ${oam_ip_map} ${GLOBAL_INJECTED_APPC_IP_ADDR}=appc Set To Dictionary ${oam_ip_map} ${GLOBAL_INJECTED_DCAE_IP_ADDR}=dcae_controller Set To Dictionary ${oam_ip_map} ${GLOBAL_INJECTED_SO_IP_ADDR}=so |