adding change management testing to testplan

Change-Id: I3492e57a7580f2714faa57bbfdb42ab4828f844b
Issue-ID: VID-462
Signed-off-by: Bartosz Gardziejewski <bartosz.gardziejewski@nokia.com>

diff --git a/plans/vid/GUITests/setup.sh b/plans/vid/GUITests/setup.sh
deleted file mode 100644 (file)
index f23fb61..0000000
--- a/plans/vid/GUITests/setup.sh
+++ /dev/null
@@ -1,41 +0,0 @@
-#!/bin/bash
-#
-# Copyright (C) 2019 Nokia Intellectual Property. All rights reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-# Place the scripts in run order:
-
-/usr/bin/Xvfb :0 -screen 0 1024x768x24&
-export DISPLAY=:0
-
-source ${SCRIPTS}/common_functions.sh
-source ${WORKSPACE}/scripts/vid/clone_and_setup_vid_data.sh
-source ${WORKSPACE}/scripts/vid/start_vid_containers.sh
-
-echo "Obtaining ip of VID server..."
-VID_IP=`get-instance-ip.sh vid-server`
-SO_SIMULATOR_IP=`get-instance-ip.sh so-simulator`
-
-bypass_ip_address ${VID_IP}
-bypass_ip_address ${SO_SIMULATOR_IP}
-
-echo VID_IP=${VID_IP}
-echo SO_SIMULATOR_IP=${SO_SIMULATOR_IP}
-
-
-# Pass any variables required by Robot test suites in ROBOT_VARIABLES
-ROBOT_VARIABLES="-v VID_IP:${VID_IP} -v SO_SIMULATOR_IP:${SO_SIMULATOR_IP}"
-
-pip install assertpy
-pip install requests
\ No newline at end of file

diff --git a/plans/vid/GUITests/teardown.sh b/plans/vid/GUITests/teardown.sh
deleted file mode 100644 (file)
index 0ade44f..0000000
--- a/plans/vid/GUITests/teardown.sh
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/bin/bash
-#
-# Copyright (C) 2019 Nokia Intellectual Property. All rights reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-source ${WORKSPACE}/scripts/vid/kill_containers_and_remove_dataFolders.sh
\ No newline at end of file

diff --git a/plans/vid/GUITests/testplan.txt b/plans/vid/GUITests/testplan.txt
deleted file mode 100644 (file)
index e54147c..0000000
--- a/plans/vid/GUITests/testplan.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-# Test suites are relative paths under [integration/csit.git]/tests/.
-# Place the suites in run order.
-
-vid/newVNFChange
\ No newline at end of file

diff --git a/plans/vid/healthCheck/testplan.txt b/plans/vid/healthCheck/testplan.txt
index 61c3908..85fdaa3 100644 (file)
--- a/plans/vid/healthCheck/testplan.txt
+++ b/plans/vid/healthCheck/testplan.txt
@@ -3,4 +3,5 @@
 vid/healthCheck
 vid/login
 vid/https-connection
-vid/scaleOut
\ No newline at end of file
+vid/scaleOut
+vid/newVNFChange
\ No newline at end of file

diff --git a/tests/vid/newVNFChange/test1.robot b/tests/vid/newVNFChange/test1.robot
index 4737c3a..33d0ae3 100644 (file)
--- a/tests/vid/newVNFChange/test1.robot
+++ b/tests/vid/newVNFChange/test1.robot
@@ -53,8 +53,6 @@ add new VNF Change in VID GUI From Local worfkow
     Click Element   xpath=//a[contains(text(),'vnf-ws')]
 
     Select From List  xpath=//select[@name='workflow']  VNF In Place Software Update
-    #temp solution
-    #Click Button    xpath=//button[@id='cancel']
 
     Wait Until Page Contains    Operations timeout    ${GLOBAL_SELENIUM_BROWSER_WAIT_TIMEOUT}
     Input Text    xpath=//input[@id='internal-workflow-parameter-text-2']    10

diff --git a/tests/vid/resources/keywords/login_vid_keywords.robot b/tests/vid/resources/keywords/login_vid_keywords.robot
index b543029..15c3f05 100644 (file)
--- a/tests/vid/resources/keywords/login_vid_keywords.robot
+++ b/tests/vid/resources/keywords/login_vid_keywords.robot
@@ -37,8 +37,6 @@ Setup Browser Firefox
     Set Global Variable    ${GLOBAL_SELENIUM_BROWSER_CAPABILITIES}    ${dc}
 
 Setup Browser Chrome
-    #${os}=   Get Normalized Os
-    #Log    Normalized OS=${os}
     ${chrome options}=    Evaluate    sys.modules['selenium.webdriver'].ChromeOptions()    sys
     Call Method    ${chrome options}    add_argument    no-sandbox
     ${dc}   Evaluate    sys.modules['selenium.webdriver'].DesiredCapabilities.CHROME  sys, selenium.webdriver