Remove Heatbridge for testing

Issue-ID: INT-1791
Change-Id: I6363d90a77afae2663b481d1d942b3c7ed9bdd92
Signed-off-by: Brian Freeman <bf1936@att.com>
(cherry picked from commit d2aa352ef40729242b0dd19049e44dbe337b3080)

diff --git a/docker/Dockerfile b/docker/Dockerfile
index 58e4d3a..977ec9e 100644 (file)
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -14,7 +14,7 @@ ARG KUBERNETES_VERSION="v1.15.11"
 
 
 ARG TESTSUITE_REPO=git.onap.org/testsuite
-ARG HEATBRIDGE_REPO=git.onap.org/testsuite/heatbridge.git
+#ARG HEATBRIDGE_REPO=git.onap.org/testsuite/heatbridge.git
 ARG PYTHON_UTILS_REPO=git.onap.org/testsuite/python-testing-utils.git
 ARG DEMO_REPO=git.onap.org/demo
 
@@ -51,11 +51,12 @@ RUN apt-get update \
     mkdir -p /var/opt/ONAP && \
     pip install -r requirements.txt && \
     pip install --no-cache-dir \
-    git+https://$HEATBRIDGE_REPO@$HEATBRIDGE_TAG#egg=heatbridge\&subdirectory=heatbridge \
     git+https://$PYTHON_UTILS_REPO@$PYTHON_UTILS_TAG#egg=robotframework-onap\&subdirectory=robotframework-onap && \
     git clone --depth 1 https://$TESTSUITE_REPO -b $TESTSUITE_TAG /var/opt/ONAP && \
     git clone --depth 1 https://$DEMO_REPO -b $DEMO_TAG /var/opt/ONAP/demo && \
     chmod +x /usr/local/bin/kubectl
+    # moved in case line extension with comment isnt supported
+    #git+https://$HEATBRIDGE_REPO@$HEATBRIDGE_TAG#egg=heatbridge\&subdirectory=heatbridge \
 
 RUN python3.7 -m pip install setuptools wheel
 RUN python3.7 -m pip install virtualenv

diff --git a/robot/resources/test_templates/vnf_orchestration_test_template.robot b/robot/resources/test_templates/vnf_orchestration_test_template.robot
index ac5c9cd..e4b4427 100644 (file)
--- a/robot/resources/test_templates/vnf_orchestration_test_template.robot
+++ b/robot/resources/test_templates/vnf_orchestration_test_template.robot
@@ -76,7 +76,10 @@ Orchestrate VNF
     \   ${generic_vnf}=   Validate Generic VNF    ${vnf_name}    ${vnf_type}    ${service_instance_id}
     \   Set To Dictionary    ${generic_vnfs}    ${vf_module_type}    ${generic_vnf}
     #    TODO: Need to look at a better way to default ipv4_oam_interface  search for Heatbridge
-    \   ${uris_to_delete}=    Execute Heatbridge    ${vf_module_name}    ${vnf}  ${service}    ipv4_oam_interface
+    ##  Part of removale of heatbridge
+    ##  \   ${uris_to_delete}=    Execute Heatbridge    ${vf_module_name}    ${vnf}  ${service}    ipv4_oam_interface
+    ##  set a fake urils_to_delete until we confirm heatbridge can be fully removed
+    \   ${uris_to_delete}=   Set Variable   'http://devnull'
     \   Validate VF Module      ${vf_module_name}    ${vnf}
     \   Append To List   ${vf_module_name_list}    ${vf_module_name}
     [Return]     ${vf_module_name_list}   ${generic_vnfs}    ${server_id}    ${service_instance_id}    ${catalog_resource_ids}   ${catalog_service_id}    ${uris_to_delete}
@@ -125,7 +128,8 @@ Orchestrate Demo VNF
     \   ${generic_vnf}=   Validate Generic VNF    ${vnf_name}    ${vnf_type}    ${service_instance_id}
     \   Set To Dictionary    ${generic_vnfs}    ${vf_module_type}    ${generic_vnf}
     #    TODO: Need to look at a better way to default ipv4_oam_interface  search for Heatbridge
-    \   Execute Heatbridge    ${vf_module_name}    ${vnf}  ${service}    ipv4_oam_interface
+    ##  Part of remove Heatbridge
+    ##\   Execute Heatbridge    ${vf_module_name}    ${vnf}  ${service}    ipv4_oam_interface
     \   Validate VF Module      ${vf_module_name}    ${vnf}
     \   Append To List   ${vf_module_name_list}   ${vf_module_name}
     [Return]     ${vf_module_name}    ${service}    ${generic_vnfs}

diff --git a/robot/resources/vid/teardown_vid.robot b/robot/resources/vid/teardown_vid.robot
index bf2af6f..a2ffc83 100644 (file)
--- a/robot/resources/vid/teardown_vid.robot
+++ b/robot/resources/vid/teardown_vid.robot
@@ -36,7 +36,8 @@ Delete VID
     Return From Keyword If    '${status}' == 'FAIL'    ${status}    ${vfmodule}
     Return From Keyword If    '${vfmodule}' == 'FAIL'    ${status}    ${vfmodule}
     # After tearing down a VF module, execute the reverse HB for it to remove the references from A&AI
-    Run Keyword If   'Vfmodule_Ete' in '${vfmodule}'    Execute Reverse Heatbridge    ${uris_to_delete}
+    ## Removed heatbridge
+    ## Run Keyword If   'Vfmodule_Ete' in '${vfmodule}'    Execute Reverse Heatbridge    ${uris_to_delete}
     Fail    Continue with Next Remove
 
 Delete Next VID Entity

diff --git a/robot/testsuites/demo.robot b/robot/testsuites/demo.robot
index 3812bb6..14fecfe 100644 (file)
--- a/robot/testsuites/demo.robot
+++ b/robot/testsuites/demo.robot
@@ -119,11 +119,11 @@ Delete Instantiated VNF
     Delete VNF    ${TENANT_NAME}    ${VVG_SERVER_ID}    ${CUSTOMER_NAME}    ${SERVICE_INSTANCE_ID}    ${STACK_NAMES}    ${REVERSE_HEATBRIDGE}
     [Teardown]   Teardown VNF    ${CUSTOMER_NAME}    ${CATALOG_SERVICE_ID}    ${CATALOG_RESOURCE_IDS}
 
-Run Heatbridge
-    [Documentation]
-    ...    Try to run heatbridge
-    [Tags]   heatbridge
-    Execute Heatbridge   ${HB_STACK}   ${HB_VNF}    ${HB_SERVICE}    ${HB_IPV4_OAM_ADDRESS}
+#Run Heatbridge
+#    [Documentation]
+#    ...    Try to run heatbridge
+#    [Tags]   heatbridge
+#    Execute Heatbridge   ${HB_STACK}   ${HB_VNF}    ${HB_SERVICE}    ${HB_IPV4_OAM_ADDRESS}
 
 Preload APPC CDT GUI
     [Documentation]

diff --git a/setup.sh b/setup.sh
index 88a0618..87cab0b 100755 (executable)
--- a/setup.sh
+++ b/setup.sh
@@ -37,31 +37,37 @@ pip install \
 # i dont why we need this, but lets protobuf work in docker
 touch /var/opt/ONAP/robot/library/google/__init__.py
 
-if [ -d $path/testsuite/heatbridge ]
-then
-    # Support LF build location
-       cd $path/testsuite/heatbridge
-else
-       cd ~
-       git config --global http.sslVerify false
-       if [ -d ~/heatbridge ]
-       then
-               cd heatbridge
-               git pull origin master
-       else
-               git clone https://gerrit.onap.org/r/testsuite/heatbridge.git
-               cd heatbridge
-       fi
-fi
+###############################
+# remove heatbridge
+# commented out for testing
+################################################################
+#if [ -d $path/testsuite/heatbridge ]
+#then
+#    # Support LF build location
+#      cd $path/testsuite/heatbridge
+#else
+#      cd ~
+#      git config --global http.sslVerify false
+#      if [ -d ~/heatbridge ]
+#      then
+#              cd heatbridge
+#              git pull origin master
+#      else
+#              git clone https://gerrit.onap.org/r/testsuite/heatbridge.git
+#              cd heatbridge
+#      fi
+#fi
 
-pip install \
---no-cache-dir \
---upgrade \
---exists-action s \
---target="$path/robot/library" \
-./heatbridge
+#pip install \
+#--no-cache-dir \
+#--upgrade \
+#--exists-action s \
+#--target="$path/robot/library" \
+#./heatbridge
+
+#sed -i 's/cinderclient\.v1\.client/cinderclient\.v2\.client/g' /var/opt/ONAP/robot/library/heatbridge/OpenstackManager.py
 
-sed -i 's/cinderclient\.v1\.client/cinderclient\.v2\.client/g' /var/opt/ONAP/robot/library/heatbridge/OpenstackManager.py
+################################################################
 
 # Go back to execution folder
 cd $path
@@ -104,4 +110,4 @@ else
                unzip $CHROMEDRIVER_TARGET
        fi
        rm -rf $CHROMEDRIVER_TARGET
-fi
\ No newline at end of file
+fi