From: garciadeblas <gerardo.garciadeblas@telefonica.com>
Date: Mon, 22 Nov 2021 14:07:35 +0000 (+0100)
Subject: Rename sol004 and sol007 packages and updated package names
X-Git-Tag: v11.0.0~2
X-Git-Url: https://osm.etsi.org/gitweb/?a=commitdiff_plain;h=4cb21662e93c3761f83d740d99279c22a163c38e;p=osm%2Ftests.git

Rename sol004 and sol007 packages and updated package names

Change-Id: I0a7fbb93decee8d523372b458833b6ba1084526a
Signed-off-by: garciadeblas <gerardo.garciadeblas@telefonica.com>
---

diff --git a/robot-systest/testsuite/basic_23-delete_vnf_package_SOL004_SOL007.robot b/robot-systest/testsuite/basic_23-delete_vnf_package_SOL004_SOL007.robot
deleted file mode 100644
index 5e58bab..0000000
--- a/robot-systest/testsuite/basic_23-delete_vnf_package_SOL004_SOL007.robot
+++ /dev/null
@@ -1,73 +0,0 @@
-#   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.
-
-*** Settings ***
-Documentation     [BASIC-23] Delete VNF SOL004 Package Before SOL007 NS Package.
-
-Library   OperatingSystem
-Library   String
-Library   Collections
-Library   Process
-Library   SSHLibrary
-
-Resource   %{ROBOT_DEVOPS_FOLDER}/lib/vnfd_lib.robot
-Resource   %{ROBOT_DEVOPS_FOLDER}/lib/nsd_lib.robot
-
-Force Tags   basic_23   cluster_main   daily   regression
-
-Suite Teardown   Run Keyword And Ignore Error   Suite Cleanup
-
-
-*** Variables ***
-# NS and VNF descriptor package folder and ids
-${vnfd_pkg}   SOL004_hackfest_basic_vnf
-${vnfd_name}   SOL004_hackfest_basic-vnf
-${nsd_pkg}   SOL007_hackfest_basic_ns
-${nsd_name}   SOL007_hackfest_basic-ns
-
-
-*** Test Cases ***
-Create VNF Package
-
-    Create VNFD   '%{PACKAGES_FOLDER}/${vnfd_pkg}'
-
-
-Create NS Package
-
-    Create NSD   '%{PACKAGES_FOLDER}/${nsd_pkg}'
-
-
-Cannot Delete VNF Package
-
-    Assert Failure Delete VNFD   ${vnfd_name}
-
-
-Delete NS Package
-    [Tags]   cleanup
-
-    Delete NSD   ${nsd_name}
-
-
-Delete VNF Package
-    [Tags]   cleanup
-
-    Delete VNFD   ${vnfd_name}
-
-
-*** Keywords ***
-Suite Cleanup
-    [Documentation]  Test Suit Cleanup: Deleting NS and VNF packages
-
-    Run Keyword If Any Tests Failed  Delete NSD   ${nsd_name}
-    Run Keyword If Any Tests Failed  Delete VNFD   ${vnfd_name}
-
-
diff --git a/robot-systest/testsuite/basic_23-sol004_sol007_packages.robot b/robot-systest/testsuite/basic_23-sol004_sol007_packages.robot
new file mode 100644
index 0000000..1d870bb
--- /dev/null
+++ b/robot-systest/testsuite/basic_23-sol004_sol007_packages.robot
@@ -0,0 +1,73 @@
+#   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.
+
+*** Settings ***
+Documentation     [BASIC-23] Creation and deletion of SOL004 and SOL007 packages.
+
+Library   OperatingSystem
+Library   String
+Library   Collections
+Library   Process
+Library   SSHLibrary
+
+Resource   %{ROBOT_DEVOPS_FOLDER}/lib/vnfd_lib.robot
+Resource   %{ROBOT_DEVOPS_FOLDER}/lib/nsd_lib.robot
+
+Force Tags   basic_23   cluster_main   daily   regression
+
+Suite Teardown   Run Keyword And Ignore Error   Suite Cleanup
+
+
+*** Variables ***
+# NS and VNF descriptor package folder and ids
+${vnfd_pkg}   sol004_hackfest_basic_vnf
+${vnfd_name}   sol004_hackfest_basic-vnf
+${nsd_pkg}   sol007_hackfest_basic_ns
+${nsd_name}   sol007_hackfest_basic-ns
+
+
+*** Test Cases ***
+Create VNF Package
+
+    Create VNFD   '%{PACKAGES_FOLDER}/${vnfd_pkg}'
+
+
+Create NS Package
+
+    Create NSD   '%{PACKAGES_FOLDER}/${nsd_pkg}'
+
+
+Cannot Delete VNF Package
+
+    Assert Failure Delete VNFD   ${vnfd_name}
+
+
+Delete NS Package
+    [Tags]   cleanup
+
+    Delete NSD   ${nsd_name}
+
+
+Delete VNF Package
+    [Tags]   cleanup
+
+    Delete VNFD   ${vnfd_name}
+
+
+*** Keywords ***
+Suite Cleanup
+    [Documentation]  Test Suit Cleanup: Deleting NS and VNF packages
+
+    Run Keyword If Any Tests Failed  Delete NSD   ${nsd_name}
+    Run Keyword If Any Tests Failed  Delete VNFD   ${vnfd_name}
+
+
diff --git a/robot-systest/testsuite/k8s_10-k8s_proxy_charms_SOL004_SOL007.robot b/robot-systest/testsuite/k8s_10-k8s_proxy_charms_SOL004_SOL007.robot
deleted file mode 100644
index efd5f32..0000000
--- a/robot-systest/testsuite/k8s_10-k8s_proxy_charms_SOL004_SOL007.robot
+++ /dev/null
@@ -1,141 +0,0 @@
-#   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.
-
-*** Settings ***
-Documentation     [K8s-10] K8s Proxy Charm using SOL004 and SOL007 packages.
-
-Library   OperatingSystem
-Library   SSHLibrary
-
-Resource   %{ROBOT_DEVOPS_FOLDER}/lib/vnfd_lib.robot
-Resource   %{ROBOT_DEVOPS_FOLDER}/lib/nsd_lib.robot
-Resource   %{ROBOT_DEVOPS_FOLDER}/lib/ns_lib.robot
-Resource   %{ROBOT_DEVOPS_FOLDER}/lib/ssh_lib.robot
-
-Force Tags   k8s_10   cluster_ee_config   cluster_k8s_charms   daily   regression
-
-Suite Teardown   Run Keyword And Ignore Error   Suite Cleanup
-
-
-*** Variables ***
-# NS and VNF descriptor package folder and ids
-${vnfd_pkg}   charm-packages/SOL004_k8s_proxy_charm_vnf
-${vnfd_name}   SOL004_k8s_proxy_charm-vnf
-${nsd_pkg}   charm-packages/SOL007_k8s_proxy_charm_ns
-${nsd_name}   SOL007_k8s_proxy_charm-ns
-
-# NS instance name and configuration
-${ns_name}   k8s_10-k8s_proxy_charm
-${ns_config}   {vld: [ {name: mgmtnet, vim-network-name: %{VIM_MGMT_NET}} ] }
-${ns_timeout}   15min
-
-# SSH keys and username to be used
-${publickey}   %{HOME}/.ssh/id_rsa.pub
-${privatekey}   %{HOME}/.ssh/id_rsa
-${username}   ubuntu
-${password}   ${EMPTY}
-
-${action_name}   touch
-${vnf_member_index_1}   1
-${vnf_member_index_2}   2
-${day_1_file_name}   /home/ubuntu/first-touch
-${day_2_file_name_1}   /home/ubuntu/mytouch1
-${day_2_file_name_2}   /home/ubuntu/mytouch2
-
-
-*** Test Cases ***
-Create Charm VNF Descriptor
-
-    Create VNFD  '%{PACKAGES_FOLDER}/${vnfd_pkg}'
-
-
-Create Charm NS Descriptor
-
-    Create NSD  '%{PACKAGES_FOLDER}/${nsd_pkg}'
-
-
-Instantiate Charm Network Service
-
-    ${id}=  Create Network Service  ${nsd_name}  %{VIM_TARGET}  ${ns_name}  ${ns_config}  ${publickey}  ${ns_timeout}
-    Set Suite Variable  ${ns_id}  ${id}
-
-
-Get Management Ip Addresses
-
-    ${ip_addr_1}  Get Vnf Management Ip Address  ${ns_id}  ${vnf_member_index_1}
-    log  ${ip_addr_1}
-    Set Suite Variable  ${vnf_1_ip_addr}  ${ip_addr_1}
-    ${ip_addr_2}  Get Vnf Management Ip Address  ${ns_id}  ${vnf_member_index_2}
-    log  ${ip_addr_2}
-    Set Suite Variable  ${vnf_2_ip_addr}  ${ip_addr_2}
-
-
-Test SSH Access
-
-    Variable Should Exist  ${vnf_1_ip_addr}  msg=IP address of the management VNF '${vnf_member_index_1}' is not available
-    Variable Should Exist  ${vnf_2_ip_addr}  msg=IP address of the management VNF '${vnf_member_index_2}' is not available
-    Sleep  30s  Waiting ssh daemon to be up
-    Test SSH Connection  ${vnf_1_ip_addr}  ${username}  ${password}  ${privatekey}
-    Test SSH Connection  ${vnf_2_ip_addr}  ${username}  ${password}  ${privatekey}
-
-
-Check Remote Files Created Via Day 1 Operations
-    [Documentation]     The Charm VNF has a Day 1 operation that creates a file named ${day_1_file_name}.
-    ...                 This test checks whether that files have been created or not.
-
-    Check If remote File Exists  ${vnf_1_ip_addr}  ${username}  ${password}  ${privatekey}  ${day_1_file_name}
-    Check If remote File Exists  ${vnf_2_ip_addr}  ${username}  ${password}  ${privatekey}  ${day_1_file_name}
-
-
-Execute Day 2 Operations
-    [Documentation]     Performs one Day 2 operation per VNF that creates a new file.
-
-    Variable Should Exist  ${ns_id}  msg=Network service instance is not available
-    ${ns_op_id_1}=  Execute NS Action  ${ns_name}  ${action_name}  ${vnf_member_index_1}  filename=${day_2_file_name_1}
-    ${ns_op_id_2}=  Execute NS Action  ${ns_name}  ${action_name}  ${vnf_member_index_2}  filename=${day_2_file_name_2}
-
-
-Check Remote Files Created Via Day 2 Operations
-    [Documentation]     Check whether the files created in the previous test via Day 2 operations exist or not.
-
-    Check If remote File Exists  ${vnf_1_ip_addr}  ${username}  ${password}  ${privatekey}  ${day_2_file_name_1}
-    Check If remote File Exists  ${vnf_2_ip_addr}  ${username}  ${password}  ${privatekey}  ${day_2_file_name_2}
-
-
-Delete NS Instance
-    [Tags]   cleanup
-
-    Delete NS  ${ns_name}
-
-
-Delete NS Descriptor
-    [Tags]   cleanup
-
-    Delete NSD  ${nsd_name}
-
-
-Delete VNF Descriptor
-    [Tags]   cleanup
-
-    Delete VNFD  ${vnfd_name}
-
-
-*** Keywords ***
-Suite Cleanup
-    [Documentation]  Test Suite Cleanup: Deleting descriptors and NS instance
-
-    Run Keyword If Any Tests Failed  Delete NS  ${ns_name}
-
-    Run Keyword If Any Tests Failed  Delete NSD  ${nsd_name}
-
-    Run Keyword If Any Tests Failed  Delete VNFD  ${vnfd_name}
-
diff --git a/robot-systest/testsuite/k8s_10-sol004_sol007_with_k8s_proxy_charms.robot b/robot-systest/testsuite/k8s_10-sol004_sol007_with_k8s_proxy_charms.robot
new file mode 100644
index 0000000..4718eb1
--- /dev/null
+++ b/robot-systest/testsuite/k8s_10-sol004_sol007_with_k8s_proxy_charms.robot
@@ -0,0 +1,141 @@
+#   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.
+
+*** Settings ***
+Documentation     [K8s-10] K8s Proxy Charm using SOL004 and SOL007 packages.
+
+Library   OperatingSystem
+Library   SSHLibrary
+
+Resource   %{ROBOT_DEVOPS_FOLDER}/lib/vnfd_lib.robot
+Resource   %{ROBOT_DEVOPS_FOLDER}/lib/nsd_lib.robot
+Resource   %{ROBOT_DEVOPS_FOLDER}/lib/ns_lib.robot
+Resource   %{ROBOT_DEVOPS_FOLDER}/lib/ssh_lib.robot
+
+Force Tags   k8s_10   cluster_ee_config   cluster_k8s_charms   daily   regression
+
+Suite Teardown   Run Keyword And Ignore Error   Suite Cleanup
+
+
+*** Variables ***
+# NS and VNF descriptor package folder and ids
+${vnfd_pkg}   charm-packages/sol004_k8s_proxy_charm_vnf
+${vnfd_name}   sol004_k8s_proxy_charm-vnf
+${nsd_pkg}   charm-packages/sol007_k8s_proxy_charm_ns
+${nsd_name}   sol007_k8s_proxy_charm-ns
+
+# NS instance name and configuration
+${ns_name}   k8s_10-k8s_proxy_charm
+${ns_config}   {vld: [ {name: mgmtnet, vim-network-name: %{VIM_MGMT_NET}} ] }
+${ns_timeout}   15min
+
+# SSH keys and username to be used
+${publickey}   %{HOME}/.ssh/id_rsa.pub
+${privatekey}   %{HOME}/.ssh/id_rsa
+${username}   ubuntu
+${password}   ${EMPTY}
+
+${action_name}   touch
+${vnf_member_index_1}   1
+${vnf_member_index_2}   2
+${day_1_file_name}   /home/ubuntu/first-touch
+${day_2_file_name_1}   /home/ubuntu/mytouch1
+${day_2_file_name_2}   /home/ubuntu/mytouch2
+
+
+*** Test Cases ***
+Create Charm VNF Descriptor
+
+    Create VNFD  '%{PACKAGES_FOLDER}/${vnfd_pkg}'
+
+
+Create Charm NS Descriptor
+
+    Create NSD  '%{PACKAGES_FOLDER}/${nsd_pkg}'
+
+
+Instantiate Charm Network Service
+
+    ${id}=  Create Network Service  ${nsd_name}  %{VIM_TARGET}  ${ns_name}  ${ns_config}  ${publickey}  ${ns_timeout}
+    Set Suite Variable  ${ns_id}  ${id}
+
+
+Get Management Ip Addresses
+
+    ${ip_addr_1}  Get Vnf Management Ip Address  ${ns_id}  ${vnf_member_index_1}
+    log  ${ip_addr_1}
+    Set Suite Variable  ${vnf_1_ip_addr}  ${ip_addr_1}
+    ${ip_addr_2}  Get Vnf Management Ip Address  ${ns_id}  ${vnf_member_index_2}
+    log  ${ip_addr_2}
+    Set Suite Variable  ${vnf_2_ip_addr}  ${ip_addr_2}
+
+
+Test SSH Access
+
+    Variable Should Exist  ${vnf_1_ip_addr}  msg=IP address of the management VNF '${vnf_member_index_1}' is not available
+    Variable Should Exist  ${vnf_2_ip_addr}  msg=IP address of the management VNF '${vnf_member_index_2}' is not available
+    Sleep  30s  Waiting ssh daemon to be up
+    Test SSH Connection  ${vnf_1_ip_addr}  ${username}  ${password}  ${privatekey}
+    Test SSH Connection  ${vnf_2_ip_addr}  ${username}  ${password}  ${privatekey}
+
+
+Check Remote Files Created Via Day 1 Operations
+    [Documentation]     The Charm VNF has a Day 1 operation that creates a file named ${day_1_file_name}.
+    ...                 This test checks whether that files have been created or not.
+
+    Check If remote File Exists  ${vnf_1_ip_addr}  ${username}  ${password}  ${privatekey}  ${day_1_file_name}
+    Check If remote File Exists  ${vnf_2_ip_addr}  ${username}  ${password}  ${privatekey}  ${day_1_file_name}
+
+
+Execute Day 2 Operations
+    [Documentation]     Performs one Day 2 operation per VNF that creates a new file.
+
+    Variable Should Exist  ${ns_id}  msg=Network service instance is not available
+    ${ns_op_id_1}=  Execute NS Action  ${ns_name}  ${action_name}  ${vnf_member_index_1}  filename=${day_2_file_name_1}
+    ${ns_op_id_2}=  Execute NS Action  ${ns_name}  ${action_name}  ${vnf_member_index_2}  filename=${day_2_file_name_2}
+
+
+Check Remote Files Created Via Day 2 Operations
+    [Documentation]     Check whether the files created in the previous test via Day 2 operations exist or not.
+
+    Check If remote File Exists  ${vnf_1_ip_addr}  ${username}  ${password}  ${privatekey}  ${day_2_file_name_1}
+    Check If remote File Exists  ${vnf_2_ip_addr}  ${username}  ${password}  ${privatekey}  ${day_2_file_name_2}
+
+
+Delete NS Instance
+    [Tags]   cleanup
+
+    Delete NS  ${ns_name}
+
+
+Delete NS Descriptor
+    [Tags]   cleanup
+
+    Delete NSD  ${nsd_name}
+
+
+Delete VNF Descriptor
+    [Tags]   cleanup
+
+    Delete VNFD  ${vnfd_name}
+
+
+*** Keywords ***
+Suite Cleanup
+    [Documentation]  Test Suite Cleanup: Deleting descriptors and NS instance
+
+    Run Keyword If Any Tests Failed  Delete NS  ${ns_name}
+
+    Run Keyword If Any Tests Failed  Delete NSD  ${nsd_name}
+
+    Run Keyword If Any Tests Failed  Delete VNFD  ${vnfd_name}
+