aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDR695H <dr695h@att.com>2019-06-17 12:16:21 -0400
committerDR695H <dr695h@att.com>2019-06-17 13:00:25 -0400
commita868f7c823fcf24bfdaa3091892bbb1efd8ca516 (patch)
tree4f7aea0521050cd4e07a295dd462acc03928323a
parentadbb84406ca25375a2b288fdc9a79c1c2d29be56 (diff)
clean up of vvp and oof
moved unit tests to subfolders and removed properties that were not defined for services that werent in oom Issue-ID: TEST-158 Change-Id: Ia93ed702ba1fc4a91d959113bb79ebb6e11124e2 Signed-off-by: DR695H <dr695h@att.com>
-rw-r--r--robot/resources/oof_interface.robot2
-rw-r--r--robot/resources/vvp_interface.robot20
-rw-r--r--robot/testsuites/oof/oof-cmso.robot (renamed from robot/testsuites/oof-cmso.robot)0
-rw-r--r--robot/testsuites/oof/oof-has.robot (renamed from robot/testsuites/oof-has.robot)0
-rw-r--r--robot/testsuites/oof/oof-osdf.robot (renamed from robot/testsuites/oof-osdf.robot)0
5 files changed, 11 insertions, 11 deletions
diff --git a/robot/resources/oof_interface.robot b/robot/resources/oof_interface.robot
index 7db08887..ad002f4b 100644
--- a/robot/resources/oof_interface.robot
+++ b/robot/resources/oof_interface.robot
@@ -23,6 +23,7 @@ ${OOF_OSDF_TEMPLATE_FOLDER} robot/assets/templates/optf-osdf
${OOF_HOMING_ENDPOINT} ${GLOBAL_OOF_SERVER_PROTOCOL}://${GLOBAL_INJECTED_OOF_HOMING_IP_ADDR}:${GLOBAL_OOF_HOMING_SERVER_PORT}
${OOF_SNIRO_ENDPOINT} ${GLOBAL_OOF_SERVER_PROTOCOL}://${GLOBAL_INJECTED_OOF_SNIRO_IP_ADDR}:${GLOBAL_OOF_SNIRO_SERVER_PORT}
${OOF_CMSO_ENDPOINT} ${GLOBAL_OOF_CMSO_PROTOCOL}://${GLOBAL_INJECTED_OOF_CMSO_IP_ADDR}:${GLOBAL_OOF_CMSO_SERVER_PORT}
+${OOF_OSDF_ENDPOINT} ${GLOBAL_OOF_SERVER_PROTOCOL}://${GLOBAL_INJECTED_OOF_HOMING_IP_ADDR}:${GLOBAL_OOF_HOMING_SERVER_PORT}
${OOF_HOMING_AUTH} Basic YWRtaW4xOnBsYW4uMTU=
@@ -175,7 +176,6 @@ Run OOF-OSDF Post Request
Log Received response from osdf ${resp.text}
[Return] ${resp}
-
Run OOF-OSDF Post Homing
[Documentation] Runs a osdf homing request
${auth}= Create List ${GLOBAL_OOF_OSDF_USERNAME} ${GLOBAL_OOF_OSDF_PASSWORD}
diff --git a/robot/resources/vvp_interface.robot b/robot/resources/vvp_interface.robot
index 0bca8a57..c33048fc 100644
--- a/robot/resources/vvp_interface.robot
+++ b/robot/resources/vvp_interface.robot
@@ -7,16 +7,16 @@ Resource global_properties.robot
*** Variables ***
${VVP_PATH} /
-${VVP_CI_UWSGI_ENDPOINT} ${GLOBAL_VVP_SERVER_PROTOCOL}://${GLOBAL_INJECTED_VVP_CI_UWSGI_IP_ADDR}:${GLOBAL_VVP_CI_UWSGI_PORT}
-${VVP_CMS_UWSGI_ENDPOINT} ${GLOBAL_VVP_SERVER_PROTOCOL}://${GLOBAL_INJECTED_VVP_CMS_UWSGI_IP_ADDR}:${GLOBAL_VVP_CMS_UWSGI_PORT1}
-${VVP_EM_UWSGI_ENDPOINT} ${GLOBAL_VVP_SERVER_PROTOCOL}://${GLOBAL_INJECTED_VVP_EM_UWSGI_IP_ADDR}:${GLOBAL_VVP_EM_UWSGI_PORT}
-${VVP_EXT_HAPROXY_ENDPOINT} ${GLOBAL_VVP_SERVER_PROTOCOL}://${GLOBAL_INJECTED_VVP_EXT_HAPROXY_IP_ADDR}:${GLOBAL_VVP_EXT_HAPROXY_PORT1}
-${VVP_GITLAB_ENDPOINT} ${GLOBAL_VVP_SERVER_PROTOCOL}://${GLOBAL_INJECTED_VVP_GITLAB_IP_ADDR}:${GLOBAL_VVP_GITLAB_PORT1}
-${VVP_IMAGESCANNER_ENDPOINT} ${GLOBAL_VVP_SERVER_PROTOCOL}://${GLOBAL_INJECTED_VVP_IMAGESCANNER_IP_ADDR}:${GLOBAL_VVP_IMAGESCANNER_PORT}
-${VVP_INT_HAPROXY_ENDPOINT} ${GLOBAL_VVP_SERVER_PROTOCOL}://${GLOBAL_INJECTED_VVP_INT_HAPROXY_IP_ADDR}:${GLOBAL_VVP_INT_HAPROXY_PORT1}
-${VVP_JENKINS_ENDPOINT} ${GLOBAL_VVP_SERVER_PROTOCOL}://${GLOBAL_INJECTED_VVP_JENKINS_IP_ADDR}:${GLOBAL_VVP_JENKINS_PORT}
-${VVP_POSTGRES_ENDPOINT} ${GLOBAL_VVP_SERVER_PROTOCOL}://${GLOBAL_INJECTED_VVP_POSTGRES_IP_ADDR}:${GLOBAL_VVP_POSTGRES_PORT}
-${VVP_REDIS_ENDPOINT} ${GLOBAL_VVP_SERVER_PROTOCOL}://${GLOBAL_INJECTED_VVP_REDIS_IP_ADDR}:${GLOBAL_VVP_REDIS_PORT}
+${VVP_CI_UWSGI_ENDPOINT}
+${VVP_CMS_UWSGI_ENDPOINT}
+${VVP_EM_UWSGI_ENDPOINT}
+${VVP_EXT_HAPROXY_ENDPOINT}
+${VVP_GITLAB_ENDPOINT}
+${VVP_IMAGESCANNER_ENDPOINT}
+${VVP_INT_HAPROXY_ENDPOINT}
+${VVP_JENKINS_ENDPOINT}
+${VVP_POSTGRES_ENDPOINT}
+${VVP_REDIS_ENDPOINT}
*** Keywords ***
Run VVP ICE CI Container (Automat Testing) Health Check
diff --git a/robot/testsuites/oof-cmso.robot b/robot/testsuites/oof/oof-cmso.robot
index 98cf63aa..98cf63aa 100644
--- a/robot/testsuites/oof-cmso.robot
+++ b/robot/testsuites/oof/oof-cmso.robot
diff --git a/robot/testsuites/oof-has.robot b/robot/testsuites/oof/oof-has.robot
index f0dd0475..f0dd0475 100644
--- a/robot/testsuites/oof-has.robot
+++ b/robot/testsuites/oof/oof-has.robot
diff --git a/robot/testsuites/oof-osdf.robot b/robot/testsuites/oof/oof-osdf.robot
index 72e04c0f..72e04c0f 100644
--- a/robot/testsuites/oof-osdf.robot
+++ b/robot/testsuites/oof/oof-osdf.robot