Rename optf base dir to optf-has

Issue-ID: OPTFRA-171

Change-Id: I19d7b8c38bf324171b7204499114e79839cc9c18
Signed-off-by: Leonardo Bellini <leonardo.bellini@att.com>

5 files changed, 14 insertions, 5 deletions

diff --git a/test/csit/tests/optf/has/__init__.robot b/test/csit/tests/optf-has/has/__init__.robot
index fb654d7bb..fb654d7bb 100644
--- a/test/csit/tests/optf/has/__init__.robot
+++ b/test/csit/tests/optf-has/has/__init__.robot
diff --git a/test/csit/tests/optf/has/data/plan_with_wrong_version.json b/test/csit/tests/optf-has/has/data/plan_with_wrong_version.json
index 9471fbf82..9471fbf82 100644
--- a/test/csit/tests/optf/has/data/plan_with_wrong_version.json
+++ b/test/csit/tests/optf-has/has/data/plan_with_wrong_version.json
diff --git a/test/csit/tests/optf/has/data/plan_without_demand_section.json b/test/csit/tests/optf-has/has/data/plan_without_demand_section.json
index 87a459d87..87a459d87 100644
--- a/test/csit/tests/optf/has/data/plan_without_demand_section.json
+++ b/test/csit/tests/optf-has/has/data/plan_without_demand_section.json
diff --git a/test/csit/tests/optf/has/optf_has_test.robot b/test/csit/tests/optf-has/has/optf_has_test.robot
index f939bd91a..ab5ded6ca 100644
--- a/test/csit/tests/optf/has/optf_has_test.robot
+++ b/test/csit/tests/optf-has/has/optf_has_test.robot
@@ -14,7 +14,7 @@ ${generatedPlanId}
 
 *** Test Cases ***
 Check ConductorApi Docker Container
-    [Documentation]    It checks cassandra docker container is running
+    [Documentation]    It checks conductor-api docker container is running
     ${rc}    ${output}=    Run and Return RC and Output    docker ps
     Log To Console              *********************
     Log To Console              retrurn_code = ${rc}
@@ -23,7 +23,7 @@ Check ConductorApi Docker Container
     Should Contain    ${output}    cond-api
 
 Check ConductorController Docker Container
-    [Documentation]    It checks zookeeper docker container is running
+    [Documentation]    It checks conductor-controller docker container is running
     ${rc}    ${output}=    Run and Return RC and Output    docker ps
     Log To Console              *********************
     Log To Console              retrurn_code = ${rc}
@@ -32,7 +32,7 @@ Check ConductorController Docker Container
     Should Contain    ${output}    cond-cont
 
 Check ConductorSolver Docker Container
-    [Documentation]    It checks tomcat docker container is running
+    [Documentation]    It checks conductor-solver docker container is running
     ${rc}    ${output}=    Run and Return RC and Output    docker ps
     Log To Console              *********************
     Log To Console              retrurn_code = ${rc}
@@ -40,8 +40,8 @@ Check ConductorSolver Docker Container
     Should Be Equal As Integers    ${rc}    0
     Should Contain    ${output}    cond-solv
 
-Check ConductorReservation War Docker Container
-    [Documentation]    It checks music.war docker container is running
+Check ConductorReservation Docker Container
+    [Documentation]    It checks conductor-reservation docker container is running
     ${rc}    ${output}=    Run and Return RC and Output    docker ps
     Log To Console              *********************
     Log To Console              retrurn_code = ${rc}
@@ -49,6 +49,15 @@ Check ConductorReservation War Docker Container
     Should Be Equal As Integers    ${rc}    0
     Should Contain    ${output}    cond-resv
 
+Check ConductorData Docker Container
+    [Documentation]    It checks conductor-data docker container is running
+    ${rc}    ${output}=    Run and Return RC and Output    docker ps
+    Log To Console              *********************
+    Log To Console              retrurn_code = ${rc}
+    Log To Console              output = ${output}
+    Should Be Equal As Integers    ${rc}    0
+    Should Contain    ${output}    cond-data
+
 Get Root Url
     [Documentation]    It sends a REST GET request to root url
     Create Session   optf-cond            ${COND_HOSTNAME}:${COND_PORT}
diff --git a/test/csit/tests/optf/osdf/data/sampletest.txt b/test/csit/tests/optf-has/osdf/data/sampletest.txt
index 9f4e8d7d6..9f4e8d7d6 100644
--- a/test/csit/tests/optf/osdf/data/sampletest.txt
+++ b/test/csit/tests/optf-has/osdf/data/sampletest.txt