Update from master
Squashed commit of the following:
commit e01365213b22d5c26d3b750d3a0f12d1f3b57b86
Author: k4.rahul <rahul.k4@tataelxsi.co.in>
Date: Wed Apr 19 17:04:06 2023 +0530
Feature 10945: Service KPI of VNF using exporter endpoint
This change has to be merged with this LCM change https://osm.etsi.org/gerrit/#/c/osm/LCM/+/13236/
Change-Id: Id1851a4f3dceddefc6c50d8f8d5335c64e01da99
Signed-off-by: k4.rahul <rahul.k4@tataelxsi.co.in>
commit 215c0ca1d541a7ee7da0b6452615f6bd48ccbdef
Author: elumalai <deepika.e@tataelxsi.co.in>
Date: Tue Apr 25 16:12:06 2023 +0530
Feature 10979: Static IPv6 Dual Stack Assignment
Added support to modify ip-address type from leaf
to leaf-list
Change-Id: I5b4d4d662802a6816f7879362de42bf3bd99f17e
Signed-off-by: elumalai <deepika.e@tataelxsi.co.in>
commit beff3a1d931816e07c2bef2e02964951892ba472
Author: garciadeblas <gerardo.garciadeblas@telefonica.com>
Date: Wed May 10 17:41:51 2023 +0200
Update IM requirements
Change-Id: I7cb28c3262a4d52f2565a8656b52c39cb759222e
Signed-off-by: garciadeblas <gerardo.garciadeblas@telefonica.com>
commit 9a62007a1e370259856cf85422321f43a3bda55b
Author: garciadeblas <gerardo.garciadeblas@telefonica.com>
Date: Tue Apr 25 01:14:45 2023 +0200
Support of Python 3.10
Adds a patch to pyangbind to continue to work with updated
packages
Change-Id: I0b33375ddbb96734ae72669baaef744bf2152bb1
Signed-off-by: garciadeblas <gerardo.garciadeblas@telefonica.com>
Signed-off-by: Mark Beierl <mark.beierl@canonical.com>
commit b6023a8098d5e98dd5aa2fc7fd9e123406fb6561
Author: garciadeblas <gerardo.garciadeblas@telefonica.com>
Date: Tue Apr 25 09:27:34 2023 +0200
Fix stage-test.sh to properly enable it
Change-Id: Id1746db909a3aed9f90badf66f77c70307c11987
Signed-off-by: garciadeblas <gerardo.garciadeblas@telefonica.com>
commit a91e2254326f90c082106fa9f27b3e08f06ec288
Author: garciadeblas <gerardo.garciadeblas@telefonica.com>
Date: Tue Apr 18 16:04:20 2023 +0200
Clean stage-archive.sh and use allowlist_extenals in tox.ini
Change-Id: I3a09df53487b8dd3c30bed8036647633dfe010d6
Signed-off-by: garciadeblas <gerardo.garciadeblas@telefonica.com>
commit 72ef227544b795ad947b81e690f7149fbd184c6e
Author: Gulsum Atici <gulsum.atici@canonical.com>
Date: Sun Jan 22 23:56:58 2023 +0300
Arranging the description of vcpu thread policy according to current Cloud API.
Change-Id: I7ca500e85d1f8e3e480bebce2f8d6b997e8a0e38
Signed-off-by: Gulsum Atici <gulsum.atici@canonical.com>
Change-Id: I4acf8ae284f3f0d6c48e734a40cb688e6fcb0135
Signed-off-by: Dario Faccin <dario.faccin@canonical.com>
diff --git a/tox.ini b/tox.ini
index 4a2494a..d6ce5d5 100644
--- a/tox.ini
+++ b/tox.ini
@@ -23,12 +23,13 @@
[testenv]
usedevelop = True
-basepython = python3.8
+basepython = python3.10
setenv = VIRTUAL_ENV={envdir}
PYTHONDONTWRITEBYTECODE = 1
passenv = HOME
deps = -r{toxinidir}/requirements.txt
skip_install = true
+parallel_show_output = true
#######################################################################################
@@ -42,6 +43,7 @@
deps = {[testenv]deps}
-r{toxinidir}/requirements-test.txt
commands =
+ sh -c "patch {toxworkdir}/cover/lib/python3.10/site-packages/pyangbind/lib/yangtypes.py < pyangbind.patch"
sh -c 'make clean'
sh -c 'make models Q=""'
sh -c 'rm -f nosetests.xml'
@@ -50,7 +52,7 @@
coverage report --omit='*tests*'
coverage html -d ./cover --omit='*tests*'
coverage xml -o coverage.xml --omit=*tests*
-whitelist_externals = sh
+allowlist_externals = sh
#######################################################################################
@@ -76,15 +78,15 @@
#######################################################################################
[testenv:pip-compile]
-deps = pip-tools==6.6.2
+deps = pip-tools==6.13.0
skip_install = true
-whitelist_externals = bash
+allowlist_externals = bash
[
commands =
- bash -c "for file in requirements*.in ; do \
UNSAFE="" ; \
if [[ $file =~ 'dist' ]] ; then UNSAFE='--allow-unsafe' ; fi ; \
- pip-compile -rU --no-header $UNSAFE $file ;\
+ pip-compile --resolver=backtracking -rU --no-header $UNSAFE $file ;\
out=`echo $file | sed 's/.in/.txt/'` ; \
sed -i -e '1 e head -16 tox.ini' $out ;\
done"
@@ -98,13 +100,14 @@
# In the commands, we copy the requirements.txt to be presented as a source file (.py)
# so it gets included in the .deb package for others to consume
commands =
+ sh -c "patch {toxworkdir}/dist/lib/python3.10/site-packages/pyangbind/lib/yangtypes.py < pyangbind.patch"
sh -c 'make clean'
sh -c 'make Q=""'
sh -c 'cp requirements.txt osm_im/requirements.txt'
python3 setup.py --command-packages=stdeb.command sdist_dsc
sh -c 'cd deb_dist/osm-im*/ && dpkg-buildpackage -rfakeroot -uc -us'
sh -c 'rm osm_im/requirements.txt'
-whitelist_externals = sh
+allowlist_externals = sh
#######################################################################################
[flake8]