From 7ef4f9b75ee1d7e0324ebbb4957328c74a42b035 Mon Sep 17 00:00:00 2001 From: Lukasz Rajewski Date: Wed, 21 Sep 2022 11:26:15 +0200 Subject: Force py3.8 in tox.ini It allows leveraging on OpenStack Yoga's upper-contraints without any exception. Issue-ID: DOC-782 Signed-off-by: Lukasz Rajewski Change-Id: Ie87d28c90e4284f25c3015f7d64ba3238929c118 --- docs/docs_StndDefined_Events_Collection_Mechanism.rst | 10 +++++----- tox.ini | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/docs/docs_StndDefined_Events_Collection_Mechanism.rst b/docs/docs_StndDefined_Events_Collection_Mechanism.rst index eb2ce7cb9..52352b42f 100644 --- a/docs/docs_StndDefined_Events_Collection_Mechanism.rst +++ b/docs/docs_StndDefined_Events_Collection_Mechanism.rst @@ -18,7 +18,7 @@ and providing them for consumption by analytics applications running on top of D 2. Standards-organization defined events can be included using a dedicated stndDefinedFields.data property 3. Standards-defined events can be validated using openAPI descriptions provided by standards organizations, and indicated in stndDefinedFields.schemaReference -`Standard Defined Events Collection Mechanism description `_ +`Standard Defined Events Collection Mechanism description `_ .. note:: @@ -31,7 +31,7 @@ and providing them for consumption by analytics applications running on top of D How to Configure VES Collector ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -By default config maps containing schema files are defined in the `OOM `_ repository and installed with dcaegen2 module. +By default config maps containing schema files are defined in the `OOM `_ repository and installed with dcaegen2 module. In Istanbul release in OOM are used schema files from https://forge.3gpp.org/rep/sa5/MnS/blob/SA88-Rel16/OpenAPI/. The newest schema files can be found in https://forge.3gpp.org/rep/sa5/MnS/tree/Rel-16-SA-91/OpenAPI If for production/test purpose are required different or newest schema files please follow procedure for `config map update `_. @@ -41,10 +41,10 @@ In order to prepare second instance of VES Collector please follow below procedu 1. (Optional step) If VES Collector should obtaining X.509 certificates from CMPv2 server for secure xNF connections please follow below steps: - Install `Cert Manager `_ - - Configure `Cert Service `_ if external CMP v2 server is in use. + - Configure `Cert Service `_ if external CMP v2 server is in use. 2. If usage of config maps from OOM containing schema files is required please follow procedure for - `external repo schema files from OOM connection to VES collector `_ + `external repo schema files from OOM connection to VES collector `_ with changes described below. As new instance of VES Collector will be introduced to ONAP namespace there is need to modify parameters from ``/inputs/k8s-ves-inputs-tls.yaml`` in Bootstrap POD @@ -94,4 +94,4 @@ In order to prepare second instance of VES Collector please follow below procedu kubectl -n onap apply -f ves-ipv6.yaml kubectl -n onap get svc | grep collector-std-def-evnents - xdcae-ves-collector-std-def-evnents NodePort fd00:101::6ad 8443:30619/TCP \ No newline at end of file + xdcae-ves-collector-std-def-evnents NodePort fd00:101::6ad 8443:30619/TCP diff --git a/tox.ini b/tox.ini index 9b0232514..f2bad2719 100644 --- a/tox.ini +++ b/tox.ini @@ -5,7 +5,7 @@ skipsdist = true requires = pip >= 8 [testenv] -basepython = python3 +basepython = python3.8 whitelist_externals = git bash @@ -40,7 +40,7 @@ commands_pre = /bin/sh -c "git --no-pager diff HEAD HEAD^ --name-only '*.rst' > /tmp/.coalist_rst" deps = -r{toxinidir}/docs/requirements-docs.txt - -chttps://git.onap.org/doc/plain/etc/upper-constraints.os.txt + -chttps://raw.githubusercontent.com/openstack/requirements/stable/yoga/upper-constraints.txt -chttps://git.onap.org/doc/plain/etc/upper-constraints.onap.txt commands = /bin/sh -c "sphinx-build -n -b html docs docs/build/html $(