Update from master
Squashed commit of the following:
commit 541f9cf287bf6c7dca45fe911f8e844988711fa3
Author: garciadeblas <gerardo.garciadeblas@telefonica.com>
Date: Tue May 23 11:59:47 2023 +0200
Fix Fail01 to get openstack quota properly after updating client version
Change-Id: Ief7b4d5f150d67cecf944021c2598456672a30e0
Signed-off-by: garciadeblas <gerardo.garciadeblas@telefonica.com>
commit a86e6938d53e345b08a7ca9cc9615115f14a002a
Author: garciadeblas <gerardo.garciadeblas@telefonica.com>
Date: Fri May 19 12:47:09 2023 +0200
Update SA02 to take into account the VNF threshold-time
Change-Id: Idde7fa330e8e9b141053c15edb266817c4e699c6
Signed-off-by: garciadeblas <gerardo.garciadeblas@telefonica.com>
commit c753f67c813fa82926b3d64db759fd7d0d7aa2cc
Author: garciadeblas <gerardo.garciadeblas@telefonica.com>
Date: Thu May 18 15:06:49 2023 +0200
Fix error message in run_test.sh for create_k8scluster
Change-Id: Ice2e0bc5e829e31a81cbde30ea6784de64d8ca63
Signed-off-by: garciadeblas <gerardo.garciadeblas@telefonica.com>
commit b9dfe0317c4935294747897dc2fd1645c4983067
Author: garciadeblas <gerardo.garciadeblas@telefonica.com>
Date: Wed May 10 17:25:47 2023 +0200
Support of Python3.10
This change includes required changes to make tests work in Python3.10.
It also enables tox running as part of stage-test, which was not included before.
For the moment, only flake8 and black envs will be checked. Some pylint
errors have been fixed, but a few remain unsolved. That's why pylint is
run, but its result is ignored.
Change-Id: I29105bf849eab8b47f92627a7eea1ede31b8e05b
Signed-off-by: garciadeblas <gerardo.garciadeblas@telefonica.com>
commit 3d7579ccc2356a23ea32878e8f0fbb0e75f59b68
Author: garciadeblas <gerardo.garciadeblas@telefonica.com>
Date: Tue Apr 18 15:04:57 2023 +0200
Clean stage-archive.sh and use allowlist_extenals in tox.ini
Change-Id: I690598c770f52d805ee3516fead7fa191c90205f
Signed-off-by: garciadeblas <gerardo.garciadeblas@telefonica.com>
commit 43f34481b4c5ccfda407a7f82a124012aab0dccc
Author: garciadeblas <gerardo.garciadeblas@telefonica.com>
Date: Thu Feb 23 17:37:47 2023 +0100
Fix bug 2220 to solve sol003_01 test
Change-Id: Ic4376067a8b42e470c09ba0668c545db8ce08e55
Signed-off-by: garciadeblas <gerardo.garciadeblas@telefonica.com>
Change-Id: Icde649f40b72a6a358ef6686fa8840f8502b2259
Signed-off-by: Dario Faccin <dario.faccin@canonical.com>
diff --git a/robot-systest/lib/ns_lib.robot b/robot-systest/lib/ns_lib.robot
index e67636c..36ecd57 100644
--- a/robot-systest/lib/ns_lib.robot
+++ b/robot-systest/lib/ns_lib.robot
@@ -97,6 +97,13 @@
[Return] ${stdout}
+Get Ns List
+ ${rc} ${stdout}= Run and Return RC and Output osm ns-list 2>&1
+ Log ${stdout}
+ Should Be Equal As Integers ${rc} ${success_return_code}
+ [Return] ${stdout}
+
+
Get Ns Vnf List
[Arguments] ${ns_id}
diff --git a/robot-systest/lib/openstack_lib.robot b/robot-systest/lib/openstack_lib.robot
index 1f1020d..80bc22b 100644
--- a/robot-systest/lib/openstack_lib.robot
+++ b/robot-systest/lib/openstack_lib.robot
@@ -64,7 +64,7 @@
[Arguments] ${field}
Should Not Be Empty ${field}
- ${rc} ${stdout}= Run and Return RC and Output openstack quota show -c ${field} -f value
+ ${rc} ${stdout}= Run and Return RC and Output openstack quota show -f yaml | yq '.[] | select(.Resource=="${field}") | .Limit'
Log ${stdout}
Should Be Equal As Integers ${rc} ${success_return_code}
[Return] ${stdout}
diff --git a/robot-systest/lib/renderTemplate.py b/robot-systest/lib/renderTemplate.py
index d472eaa..2c7bb39 100644
--- a/robot-systest/lib/renderTemplate.py
+++ b/robot-systest/lib/renderTemplate.py
@@ -14,8 +14,8 @@
from jinja2 import Template
-class renderTemplate():
+class renderTemplate:
def render_template(self, template_file, config_file, **kwargs):
"""Renders a template with the values provided
diff --git a/robot-systest/lib/sol003_common_lib.robot b/robot-systest/lib/sol003_common_lib.robot
index 7262161..d233498 100644
--- a/robot-systest/lib/sol003_common_lib.robot
+++ b/robot-systest/lib/sol003_common_lib.robot
@@ -35,7 +35,7 @@
Get Auth Token
[Tags] auth_token
Get Hostname
- Create Session osmhit ${HOST}
+ Create Session osmhit ${HOST} disable_warnings=1
&{headers} Create Dictionary Content-Type=application/json Accept=application/json
&{data} Create Dictionary username=${osm_user} password=${osm_password} project-id=${osm_project}
${resp}= Post On Session osmhit ${auth_token_uri} json=${data} headers=${headers}
@@ -89,7 +89,7 @@
[Arguments] ${JsonInput} ${key}
${json_path}= Read Directory
${json_obj}= Load JSON From File ${json_path}/${JsonInput}
- ${updated_json_obj} JSONLibrary.Update Value To Json ${json_obj} $..${key} ${created_vim_account_id}
+ ${updated_json_obj}= JSONLibrary.Update Value To Json ${json_obj} $..${key} ${created_vim_account_id}
Set Suite Variable ${updated_json_obj}
Get Api Request
diff --git a/robot-systest/lib/vnf_lib.robot b/robot-systest/lib/vnf_lib.robot
index 78f971d..b3d4aa7 100644
--- a/robot-systest/lib/vnf_lib.robot
+++ b/robot-systest/lib/vnf_lib.robot
@@ -15,6 +15,13 @@
*** Keywords ***
+Get Vnf List
+ ${rc} ${stdout}= Run and Return RC and Output osm vnf-list 2>&1
+ Log ${stdout}
+ Should Be Equal As Integers ${rc} ${success_return_code}
+ [Return] ${stdout}
+
+
Get VNF VIM ID
[Arguments] ${vnf_id}