summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichal Jagiello <michal.jagiello@t-mobile.pl>2021-01-15 13:04:54 +0000
committerJessica Wagantall <jwagantall@linuxfoundation.org>2021-02-12 17:21:50 +0000
commitaa6f2f2d4e2ffe842508f3de1e28d5a0ce2bf270 (patch)
treeaf9575e09b14812ac939d91b9690dead35cfaeaf
parent603a6752e1e9514491740c274f91d09ed6fcdc59 (diff)
Bump pysnmp requirement version
Currently used pysnmp version can't be used with Python >= 3.7 version due to new keyword usage. Add py37, py38 and py39 envs into tox config. Added mvn-phase-lib locally to test python3 tox Issue-ID: DCAEGEN2-2494 Signed-off-by: Michal Jagiello <michal.jagiello@t-mobile.pl> Change-Id: I526ceb8d66b40b0a87f0ba688e1ed7f2e3e5b34f Signed-off-by: vv770d <vv770d@att.com>
-rw-r--r--coverage.xml1157
-rw-r--r--mvn-phase-lib.sh541
-rwxr-xr-xmvn-phase-script.sh14
-rw-r--r--requirements.txt2
-rw-r--r--setup.py5
-rw-r--r--tox.ini3
-rw-r--r--version.properties2
7 files changed, 556 insertions, 1168 deletions
diff --git a/coverage.xml b/coverage.xml
deleted file mode 100644
index 1ef294e..0000000
--- a/coverage.xml
+++ /dev/null
@@ -1,1157 +0,0 @@
-<?xml version="1.0" ?>
-<coverage branch-rate="0" branches-covered="0" branches-valid="0" complexity="0" line-rate="0.6032" lines-covered="646" lines-valid="1071" timestamp="1584496786177" version="5.0.4">
- <!-- Generated by coverage.py: https://coverage.readthedocs.io -->
- <!-- Based on https://raw.githubusercontent.com/cobertura/web/master/htdocs/xml/coverage-04.dtd -->
- <sources>
- <source>/home/th1395x/onap/dcaegen2/snmptrap/snmptrap</source>
- </sources>
- <packages>
- <package branch-rate="0" complexity="0" line-rate="0.2397" name=".">
- <classes>
- <class branch-rate="0" complexity="0" filename="__init__.py" line-rate="1" name="__init__.py">
- <methods/>
- <lines/>
- </class>
- <class branch-rate="0" complexity="0" filename="snmptrapd.py" line-rate="0.2397" name="snmptrapd.py">
- <methods/>
- <lines>
- <line hits="1" number="16"/>
- <line hits="1" number="31"/>
- <line hits="1" number="34"/>
- <line hits="1" number="35"/>
- <line hits="1" number="36"/>
- <line hits="1" number="37"/>
- <line hits="1" number="38"/>
- <line hits="1" number="39"/>
- <line hits="1" number="40"/>
- <line hits="1" number="41"/>
- <line hits="1" number="42"/>
- <line hits="1" number="43"/>
- <line hits="1" number="44"/>
- <line hits="1" number="45"/>
- <line hits="1" number="46"/>
- <line hits="1" number="47"/>
- <line hits="1" number="48"/>
- <line hits="1" number="49"/>
- <line hits="1" number="50"/>
- <line hits="1" number="51"/>
- <line hits="1" number="52"/>
- <line hits="1" number="53"/>
- <line hits="1" number="54"/>
- <line hits="1" number="55"/>
- <line hits="1" number="58"/>
- <line hits="1" number="59"/>
- <line hits="1" number="61"/>
- <line hits="1" number="62"/>
- <line hits="1" number="63"/>
- <line hits="1" number="66"/>
- <line hits="1" number="68"/>
- <line hits="1" number="69"/>
- <line hits="1" number="70"/>
- <line hits="1" number="71"/>
- <line hits="1" number="73"/>
- <line hits="1" number="74"/>
- <line hits="1" number="75"/>
- <line hits="1" number="78"/>
- <line hits="1" number="79"/>
- <line hits="1" number="81"/>
- <line hits="1" number="83"/>
- <line hits="1" number="84"/>
- <line hits="1" number="91"/>
- <line hits="1" number="102"/>
- <line hits="1" number="103"/>
- <line hits="1" number="104"/>
- <line hits="1" number="112"/>
- <line hits="1" number="129"/>
- <line hits="1" number="130"/>
- <line hits="1" number="132"/>
- <line hits="1" number="136"/>
- <line hits="0" number="137"/>
- <line hits="0" number="138"/>
- <line hits="0" number="139"/>
- <line hits="1" number="141"/>
- <line hits="1" number="144"/>
- <line hits="1" number="145"/>
- <line hits="1" number="148"/>
- <line hits="1" number="150"/>
- <line hits="1" number="153"/>
- <line hits="1" number="154"/>
- <line hits="1" number="157"/>
- <line hits="1" number="160"/>
- <line hits="1" number="161"/>
- <line hits="1" number="163"/>
- <line hits="1" number="166"/>
- <line hits="1" number="167"/>
- <line hits="1" number="168"/>
- <line hits="1" number="171"/>
- <line hits="1" number="177"/>
- <line hits="0" number="179"/>
- <line hits="0" number="180"/>
- <line hits="0" number="181"/>
- <line hits="0" number="185"/>
- <line hits="0" number="187"/>
- <line hits="0" number="188"/>
- <line hits="0" number="190"/>
- <line hits="0" number="192"/>
- <line hits="0" number="193"/>
- <line hits="0" number="195"/>
- <line hits="0" number="196"/>
- <line hits="0" number="198"/>
- <line hits="0" number="199"/>
- <line hits="0" number="201"/>
- <line hits="0" number="204"/>
- <line hits="0" number="207"/>
- <line hits="1" number="214"/>
- <line hits="1" number="217"/>
- <line hits="0" number="218"/>
- <line hits="0" number="219"/>
- <line hits="0" number="220"/>
- <line hits="0" number="221"/>
- <line hits="1" number="222"/>
- <line hits="0" number="223"/>
- <line hits="0" number="224"/>
- <line hits="0" number="225"/>
- <line hits="0" number="226"/>
- <line hits="1" number="229"/>
- <line hits="1" number="230"/>
- <line hits="0" number="231"/>
- <line hits="0" number="232"/>
- <line hits="1" number="235"/>
- <line hits="1" number="236"/>
- <line hits="1" number="237"/>
- <line hits="1" number="238"/>
- <line hits="1" number="255"/>
- <line hits="1" number="256"/>
- <line hits="1" number="258"/>
- <line hits="1" number="266"/>
- <line hits="0" number="271"/>
- <line hits="0" number="272"/>
- <line hits="0" number="274"/>
- <line hits="0" number="275"/>
- <line hits="0" number="276"/>
- <line hits="0" number="278"/>
- <line hits="0" number="280"/>
- <line hits="0" number="281"/>
- <line hits="0" number="283"/>
- <line hits="1" number="291"/>
- <line hits="0" number="302"/>
- <line hits="0" number="304"/>
- <line hits="0" number="305"/>
- <line hits="0" number="306"/>
- <line hits="0" number="308"/>
- <line hits="0" number="311"/>
- <line hits="0" number="312"/>
- <line hits="0" number="315"/>
- <line hits="0" number="317"/>
- <line hits="0" number="318"/>
- <line hits="0" number="320"/>
- <line hits="0" number="321"/>
- <line hits="0" number="323"/>
- <line hits="0" number="324"/>
- <line hits="0" number="325"/>
- <line hits="0" number="326"/>
- <line hits="0" number="328"/>
- <line hits="0" number="330"/>
- <line hits="0" number="334"/>
- <line hits="0" number="336"/>
- <line hits="0" number="338"/>
- <line hits="0" number="344"/>
- <line hits="0" number="345"/>
- <line hits="0" number="347"/>
- <line hits="0" number="349"/>
- <line hits="0" number="350"/>
- <line hits="0" number="351"/>
- <line hits="0" number="352"/>
- <line hits="0" number="354"/>
- <line hits="0" number="356"/>
- <line hits="0" number="359"/>
- <line hits="0" number="360"/>
- <line hits="0" number="362"/>
- <line hits="0" number="365"/>
- <line hits="0" number="366"/>
- <line hits="0" number="368"/>
- <line hits="0" number="371"/>
- <line hits="0" number="373"/>
- <line hits="0" number="374"/>
- <line hits="0" number="376"/>
- <line hits="0" number="378"/>
- <line hits="0" number="380"/>
- <line hits="0" number="382"/>
- <line hits="0" number="383"/>
- <line hits="0" number="385"/>
- <line hits="0" number="388"/>
- <line hits="0" number="389"/>
- <line hits="0" number="390"/>
- <line hits="0" number="391"/>
- <line hits="1" number="398"/>
- <line hits="0" number="401"/>
- <line hits="0" number="402"/>
- <line hits="1" number="410"/>
- <line hits="0" number="449"/>
- <line hits="0" number="453"/>
- <line hits="0" number="454"/>
- <line hits="0" number="455"/>
- <line hits="0" number="456"/>
- <line hits="0" number="458"/>
- <line hits="0" number="459"/>
- <line hits="0" number="460"/>
- <line hits="0" number="461"/>
- <line hits="0" number="462"/>
- <line hits="0" number="466"/>
- <line hits="0" number="469"/>
- <line hits="0" number="472"/>
- <line hits="0" number="473"/>
- <line hits="0" number="478"/>
- <line hits="0" number="479"/>
- <line hits="0" number="482"/>
- <line hits="0" number="484"/>
- <line hits="0" number="487"/>
- <line hits="0" number="489"/>
- <line hits="0" number="490"/>
- <line hits="0" number="492"/>
- <line hits="0" number="493"/>
- <line hits="0" number="494"/>
- <line hits="0" number="505"/>
- <line hits="0" number="506"/>
- <line hits="0" number="508"/>
- <line hits="0" number="509"/>
- <line hits="0" number="517"/>
- <line hits="0" number="520"/>
- <line hits="0" number="521"/>
- <line hits="0" number="524"/>
- <line hits="1" number="530"/>
- <line hits="0" number="550"/>
- <line hits="0" number="551"/>
- <line hits="0" number="553"/>
- <line hits="1" number="565"/>
- <line hits="0" number="583"/>
- <line hits="0" number="584"/>
- <line hits="0" number="588"/>
- <line hits="0" number="589"/>
- <line hits="0" number="591"/>
- <line hits="0" number="592"/>
- <line hits="0" number="593"/>
- <line hits="0" number="596"/>
- <line hits="0" number="597"/>
- <line hits="0" number="598"/>
- <line hits="0" number="600"/>
- <line hits="0" number="603"/>
- <line hits="0" number="604"/>
- <line hits="0" number="605"/>
- <line hits="0" number="606"/>
- <line hits="0" number="612"/>
- <line hits="0" number="613"/>
- <line hits="0" number="614"/>
- <line hits="0" number="616"/>
- <line hits="0" number="617"/>
- <line hits="0" number="618"/>
- <line hits="0" number="620"/>
- <line hits="0" number="622"/>
- <line hits="0" number="623"/>
- <line hits="0" number="624"/>
- <line hits="0" number="625"/>
- <line hits="0" number="627"/>
- <line hits="0" number="629"/>
- <line hits="0" number="630"/>
- <line hits="1" number="635"/>
- <line hits="0" number="655"/>
- <line hits="0" number="656"/>
- <line hits="0" number="668"/>
- <line hits="0" number="669"/>
- <line hits="0" number="670"/>
- <line hits="0" number="671"/>
- <line hits="0" number="672"/>
- <line hits="0" number="675"/>
- <line hits="0" number="676"/>
- <line hits="0" number="678"/>
- <line hits="0" number="680"/>
- <line hits="0" number="681"/>
- <line hits="0" number="683"/>
- <line hits="0" number="687"/>
- <line hits="0" number="689"/>
- <line hits="0" number="692"/>
- <line hits="0" number="695"/>
- <line hits="0" number="698"/>
- <line hits="0" number="700"/>
- <line hits="0" number="701"/>
- <line hits="0" number="704"/>
- <line hits="0" number="707"/>
- <line hits="0" number="708"/>
- <line hits="0" number="711"/>
- <line hits="0" number="712"/>
- <line hits="0" number="714"/>
- <line hits="0" number="717"/>
- <line hits="0" number="718"/>
- <line hits="0" number="720"/>
- <line hits="0" number="721"/>
- <line hits="0" number="722"/>
- <line hits="0" number="723"/>
- <line hits="0" number="725"/>
- <line hits="0" number="727"/>
- <line hits="0" number="729"/>
- <line hits="0" number="730"/>
- <line hits="0" number="732"/>
- <line hits="0" number="734"/>
- <line hits="0" number="735"/>
- <line hits="0" number="736"/>
- <line hits="0" number="737"/>
- <line hits="0" number="739"/>
- <line hits="0" number="741"/>
- <line hits="0" number="743"/>
- <line hits="1" number="752"/>
- <line hits="0" number="754"/>
- <line hits="0" number="756"/>
- <line hits="0" number="758"/>
- <line hits="0" number="762"/>
- <line hits="0" number="765"/>
- <line hits="0" number="766"/>
- <line hits="0" number="769"/>
- <line hits="0" number="770"/>
- <line hits="0" number="773"/>
- <line hits="0" number="774"/>
- <line hits="0" number="775"/>
- <line hits="0" number="779"/>
- <line hits="0" number="782"/>
- <line hits="0" number="785"/>
- <line hits="0" number="786"/>
- <line hits="0" number="788"/>
- <line hits="0" number="791"/>
- <line hits="0" number="794"/>
- <line hits="0" number="795"/>
- <line hits="0" number="796"/>
- <line hits="0" number="797"/>
- <line hits="0" number="800"/>
- <line hits="0" number="803"/>
- <line hits="0" number="806"/>
- <line hits="0" number="807"/>
- <line hits="0" number="808"/>
- <line hits="0" number="809"/>
- <line hits="0" number="812"/>
- <line hits="0" number="814"/>
- <line hits="0" number="815"/>
- <line hits="0" number="816"/>
- <line hits="0" number="817"/>
- <line hits="0" number="820"/>
- <line hits="0" number="823"/>
- <line hits="0" number="825"/>
- <line hits="0" number="826"/>
- <line hits="0" number="827"/>
- <line hits="0" number="830"/>
- <line hits="0" number="834"/>
- <line hits="0" number="841"/>
- <line hits="0" number="842"/>
- <line hits="0" number="843"/>
- <line hits="0" number="845"/>
- <line hits="0" number="852"/>
- <line hits="0" number="858"/>
- <line hits="0" number="859"/>
- <line hits="0" number="861"/>
- <line hits="0" number="863"/>
- <line hits="0" number="864"/>
- <line hits="0" number="866"/>
- <line hits="0" number="867"/>
- <line hits="0" number="868"/>
- <line hits="0" number="869"/>
- <line hits="0" number="872"/>
- <line hits="0" number="873"/>
- <line hits="0" number="874"/>
- <line hits="0" number="876"/>
- <line hits="0" number="877"/>
- <line hits="0" number="883"/>
- <line hits="0" number="884"/>
- <line hits="0" number="886"/>
- <line hits="0" number="887"/>
- <line hits="0" number="889"/>
- <line hits="0" number="891"/>
- <line hits="0" number="892"/>
- <line hits="0" number="893"/>
- <line hits="0" number="894"/>
- <line hits="0" number="903"/>
- <line hits="0" number="906"/>
- <line hits="0" number="914"/>
- <line hits="0" number="918"/>
- <line hits="0" number="925"/>
- <line hits="0" number="927"/>
- <line hits="0" number="930"/>
- <line hits="0" number="931"/>
- <line hits="0" number="932"/>
- <line hits="0" number="933"/>
- <line hits="0" number="934"/>
- <line hits="0" number="935"/>
- </lines>
- </class>
- </classes>
- </package>
- <package branch-rate="0" complexity="0" line-rate="0.7895" name="mod">
- <classes>
- <class branch-rate="0" complexity="0" filename="mod/__init__.py" line-rate="1" name="__init__.py">
- <methods/>
- <lines/>
- </class>
- <class branch-rate="0" complexity="0" filename="mod/trapd_exit.py" line-rate="1" name="trapd_exit.py">
- <methods/>
- <lines>
- <line hits="1" number="16"/>
- <line hits="1" number="21"/>
- <line hits="1" number="23"/>
- <line hits="1" number="24"/>
- <line hits="1" number="25"/>
- <line hits="1" number="26"/>
- <line hits="1" number="28"/>
- <line hits="1" number="36"/>
- <line hits="1" number="56"/>
- <line hits="1" number="57"/>
- <line hits="1" number="58"/>
- </lines>
- </class>
- <class branch-rate="0" complexity="0" filename="mod/trapd_get_cbs_config.py" line-rate="0.7937" name="trapd_get_cbs_config.py">
- <methods/>
- <lines>
- <line hits="1" number="16"/>
- <line hits="1" number="22"/>
- <line hits="1" number="24"/>
- <line hits="1" number="25"/>
- <line hits="1" number="26"/>
- <line hits="1" number="27"/>
- <line hits="1" number="28"/>
- <line hits="1" number="29"/>
- <line hits="1" number="30"/>
- <line hits="1" number="32"/>
- <line hits="1" number="33"/>
- <line hits="1" number="34"/>
- <line hits="1" number="35"/>
- <line hits="1" number="37"/>
- <line hits="1" number="45"/>
- <line hits="1" number="53"/>
- <line hits="1" number="56"/>
- <line hits="1" number="57"/>
- <line hits="0" number="58"/>
- <line hits="0" number="59"/>
- <line hits="0" number="60"/>
- <line hits="1" number="63"/>
- <line hits="1" number="64"/>
- <line hits="1" number="65"/>
- <line hits="1" number="67"/>
- <line hits="1" number="68"/>
- <line hits="0" number="69"/>
- <line hits="0" number="70"/>
- <line hits="0" number="71"/>
- <line hits="0" number="72"/>
- <line hits="1" number="74"/>
- <line hits="1" number="75"/>
- <line hits="1" number="76"/>
- <line hits="1" number="77"/>
- <line hits="1" number="79"/>
- <line hits="1" number="81"/>
- <line hits="1" number="82"/>
- <line hits="1" number="83"/>
- <line hits="1" number="84"/>
- <line hits="1" number="86"/>
- <line hits="1" number="87"/>
- <line hits="1" number="88"/>
- <line hits="1" number="90"/>
- <line hits="1" number="91"/>
- <line hits="1" number="94"/>
- <line hits="1" number="95"/>
- <line hits="1" number="98"/>
- <line hits="1" number="99"/>
- <line hits="1" number="100"/>
- <line hits="1" number="101"/>
- <line hits="1" number="104"/>
- <line hits="1" number="105"/>
- <line hits="0" number="106"/>
- <line hits="0" number="107"/>
- <line hits="1" number="110"/>
- <line hits="1" number="111"/>
- <line hits="0" number="112"/>
- <line hits="0" number="113"/>
- <line hits="1" number="115"/>
- <line hits="1" number="116"/>
- <line hits="0" number="117"/>
- <line hits="0" number="118"/>
- <line hits="1" number="120"/>
- </lines>
- </class>
- <class branch-rate="0" complexity="0" filename="mod/trapd_http_session.py" line-rate="0.6552" name="trapd_http_session.py">
- <methods/>
- <lines>
- <line hits="1" number="16"/>
- <line hits="1" number="21"/>
- <line hits="1" number="23"/>
- <line hits="1" number="24"/>
- <line hits="1" number="25"/>
- <line hits="1" number="27"/>
- <line hits="1" number="33"/>
- <line hits="1" number="48"/>
- <line hits="1" number="49"/>
- <line hits="0" number="50"/>
- <line hits="0" number="51"/>
- <line hits="0" number="52"/>
- <line hits="0" number="53"/>
- <line hits="0" number="54"/>
- <line hits="1" number="56"/>
- <line hits="1" number="62"/>
- <line hits="1" number="78"/>
- <line hits="1" number="79"/>
- <line hits="1" number="80"/>
- <line hits="1" number="81"/>
- <line hits="0" number="82"/>
- <line hits="0" number="83"/>
- <line hits="0" number="84"/>
- <line hits="0" number="86"/>
- <line hits="0" number="87"/>
- <line hits="1" number="93"/>
- <line hits="1" number="110"/>
- <line hits="1" number="113"/>
- <line hits="1" number="114"/>
- </lines>
- </class>
- <class branch-rate="0" complexity="0" filename="mod/trapd_io.py" line-rate="0.6599" name="trapd_io.py">
- <methods/>
- <lines>
- <line hits="1" number="16"/>
- <line hits="1" number="19"/>
- <line hits="1" number="22"/>
- <line hits="1" number="23"/>
- <line hits="1" number="24"/>
- <line hits="1" number="25"/>
- <line hits="1" number="26"/>
- <line hits="1" number="27"/>
- <line hits="1" number="28"/>
- <line hits="1" number="29"/>
- <line hits="1" number="30"/>
- <line hits="1" number="31"/>
- <line hits="1" number="32"/>
- <line hits="1" number="33"/>
- <line hits="1" number="36"/>
- <line hits="1" number="37"/>
- <line hits="1" number="39"/>
- <line hits="1" number="47"/>
- <line hits="1" number="55"/>
- <line hits="1" number="57"/>
- <line hits="1" number="59"/>
- <line hits="0" number="61"/>
- <line hits="0" number="62"/>
- <line hits="0" number="63"/>
- <line hits="0" number="64"/>
- <line hits="1" number="66"/>
- <line hits="1" number="67"/>
- <line hits="1" number="68"/>
- <line hits="1" number="69"/>
- <line hits="0" number="71"/>
- <line hits="0" number="72"/>
- <line hits="0" number="73"/>
- <line hits="0" number="74"/>
- <line hits="0" number="75"/>
- <line hits="0" number="78"/>
- <line hits="0" number="80"/>
- <line hits="0" number="81"/>
- <line hits="0" number="82"/>
- <line hits="0" number="83"/>
- <line hits="0" number="85"/>
- <line hits="0" number="86"/>
- <line hits="0" number="89"/>
- <line hits="0" number="91"/>
- <line hits="0" number="92"/>
- <line hits="0" number="93"/>
- <line hits="0" number="94"/>
- <line hits="0" number="96"/>
- <line hits="0" number="97"/>
- <line hits="1" number="106"/>
- <line hits="1" number="111"/>
- <line hits="1" number="114"/>
- <line hits="1" number="116"/>
- <line hits="1" number="118"/>
- <line hits="1" number="119"/>
- <line hits="1" number="120"/>
- <line hits="1" number="121"/>
- <line hits="1" number="123"/>
- <line hits="1" number="124"/>
- <line hits="1" number="126"/>
- <line hits="0" number="128"/>
- <line hits="0" number="129"/>
- <line hits="0" number="130"/>
- <line hits="0" number="131"/>
- <line hits="1" number="133"/>
- <line hits="1" number="134"/>
- <line hits="1" number="136"/>
- <line hits="0" number="137"/>
- <line hits="0" number="138"/>
- <line hits="0" number="139"/>
- <line hits="0" number="140"/>
- <line hits="1" number="142"/>
- <line hits="1" number="143"/>
- <line hits="1" number="145"/>
- <line hits="0" number="146"/>
- <line hits="0" number="147"/>
- <line hits="0" number="148"/>
- <line hits="0" number="149"/>
- <line hits="1" number="151"/>
- <line hits="1" number="158"/>
- <line hits="1" number="163"/>
- <line hits="1" number="167"/>
- <line hits="1" number="170"/>
- <line hits="0" number="171"/>
- <line hits="0" number="172"/>
- <line hits="0" number="173"/>
- <line hits="0" number="174"/>
- <line hits="0" number="175"/>
- <line hits="0" number="178"/>
- <line hits="0" number="180"/>
- <line hits="1" number="182"/>
- <line hits="1" number="189"/>
- <line hits="1" number="194"/>
- <line hits="1" number="197"/>
- <line hits="1" number="198"/>
- <line hits="1" number="199"/>
- <line hits="1" number="200"/>
- <line hits="1" number="201"/>
- <line hits="1" number="202"/>
- <line hits="0" number="208"/>
- <line hits="1" number="213"/>
- <line hits="1" number="215"/>
- <line hits="1" number="216"/>
- <line hits="1" number="217"/>
- <line hits="1" number="218"/>
- <line hits="1" number="219"/>
- <line hits="1" number="221"/>
- <line hits="1" number="222"/>
- <line hits="1" number="230"/>
- <line hits="1" number="304"/>
- <line hits="1" number="308"/>
- <line hits="1" number="309"/>
- <line hits="1" number="316"/>
- <line hits="0" number="317"/>
- <line hits="0" number="318"/>
- <line hits="0" number="320"/>
- <line hits="0" number="321"/>
- <line hits="0" number="322"/>
- <line hits="0" number="323"/>
- <line hits="0" number="325"/>
- <line hits="1" number="327"/>
- <line hits="1" number="329"/>
- <line hits="1" number="333"/>
- <line hits="1" number="335"/>
- <line hits="1" number="336"/>
- <line hits="1" number="337"/>
- <line hits="1" number="338"/>
- <line hits="1" number="339"/>
- <line hits="1" number="343"/>
- <line hits="1" number="345"/>
- <line hits="1" number="346"/>
- <line hits="1" number="347"/>
- <line hits="1" number="348"/>
- <line hits="1" number="349"/>
- <line hits="1" number="351"/>
- <line hits="1" number="353"/>
- <line hits="1" number="354"/>
- <line hits="1" number="355"/>
- <line hits="1" number="356"/>
- <line hits="1" number="362"/>
- <line hits="1" number="364"/>
- <line hits="1" number="365"/>
- <line hits="1" number="366"/>
- <line hits="1" number="367"/>
- <line hits="1" number="369"/>
- <line hits="1" number="376"/>
- <line hits="1" number="391"/>
- <line hits="1" number="393"/>
- </lines>
- </class>
- <class branch-rate="0" complexity="0" filename="mod/trapd_runtime_pid.py" line-rate="0.8846" name="trapd_runtime_pid.py">
- <methods/>
- <lines>
- <line hits="1" number="16"/>
- <line hits="1" number="21"/>
- <line hits="1" number="23"/>
- <line hits="1" number="24"/>
- <line hits="1" number="25"/>
- <line hits="1" number="26"/>
- <line hits="1" number="27"/>
- <line hits="1" number="29"/>
- <line hits="1" number="35"/>
- <line hits="1" number="49"/>
- <line hits="1" number="50"/>
- <line hits="1" number="51"/>
- <line hits="1" number="52"/>
- <line hits="1" number="53"/>
- <line hits="1" number="54"/>
- <line hits="1" number="55"/>
- <line hits="1" number="61"/>
- <line hits="1" number="67"/>
- <line hits="1" number="80"/>
- <line hits="1" number="81"/>
- <line hits="1" number="82"/>
- <line hits="1" number="83"/>
- <line hits="1" number="85"/>
- <line hits="0" number="87"/>
- <line hits="0" number="88"/>
- <line hits="0" number="89"/>
- </lines>
- </class>
- <class branch-rate="0" complexity="0" filename="mod/trapd_settings.py" line-rate="1" name="trapd_settings.py">
- <methods/>
- <lines>
- <line hits="1" number="16"/>
- <line hits="1" number="19"/>
- <line hits="1" number="22"/>
- <line hits="1" number="27"/>
- <line hits="1" number="38"/>
- <line hits="1" number="40"/>
- <line hits="1" number="45"/>
- <line hits="1" number="47"/>
- <line hits="1" number="50"/>
- <line hits="1" number="52"/>
- <line hits="1" number="55"/>
- <line hits="1" number="57"/>
- <line hits="1" number="60"/>
- <line hits="1" number="62"/>
- <line hits="1" number="65"/>
- <line hits="1" number="67"/>
- <line hits="1" number="69"/>
- <line hits="1" number="74"/>
- <line hits="1" number="76"/>
- <line hits="1" number="78"/>
- <line hits="1" number="80"/>
- <line hits="1" number="82"/>
- <line hits="1" number="84"/>
- <line hits="1" number="86"/>
- <line hits="1" number="91"/>
- <line hits="1" number="93"/>
- <line hits="1" number="95"/>
- <line hits="1" number="97"/>
- <line hits="1" number="99"/>
- <line hits="1" number="101"/>
- <line hits="1" number="103"/>
- <line hits="1" number="105"/>
- <line hits="1" number="110"/>
- <line hits="1" number="115"/>
- <line hits="1" number="117"/>
- <line hits="1" number="122"/>
- <line hits="1" number="124"/>
- <line hits="1" number="129"/>
- <line hits="1" number="133"/>
- <line hits="1" number="136"/>
- <line hits="1" number="147"/>
- <line hits="1" number="148"/>
- <line hits="1" number="149"/>
- <line hits="1" number="150"/>
- <line hits="1" number="151"/>
- <line hits="1" number="152"/>
- <line hits="1" number="161"/>
- <line hits="1" number="162"/>
- <line hits="1" number="163"/>
- <line hits="1" number="164"/>
- <line hits="1" number="165"/>
- <line hits="1" number="166"/>
- <line hits="1" number="167"/>
- <line hits="1" number="170"/>
- <line hits="1" number="173"/>
- </lines>
- </class>
- <class branch-rate="0" complexity="0" filename="mod/trapd_snmpv3.py" line-rate="0.8519" name="trapd_snmpv3.py">
- <methods/>
- <lines>
- <line hits="1" number="16"/>
- <line hits="1" number="23"/>
- <line hits="1" number="25"/>
- <line hits="1" number="26"/>
- <line hits="1" number="27"/>
- <line hits="1" number="28"/>
- <line hits="1" number="29"/>
- <line hits="1" number="30"/>
- <line hits="1" number="31"/>
- <line hits="1" number="32"/>
- <line hits="1" number="34"/>
- <line hits="1" number="35"/>
- <line hits="1" number="36"/>
- <line hits="1" number="37"/>
- <line hits="1" number="39"/>
- <line hits="1" number="40"/>
- <line hits="1" number="41"/>
- <line hits="1" number="43"/>
- <line hits="1" number="50"/>
- <line hits="1" number="60"/>
- <line hits="1" number="61"/>
- <line hits="1" number="62"/>
- <line hits="1" number="63"/>
- <line hits="1" number="64"/>
- <line hits="1" number="65"/>
- <line hits="1" number="67"/>
- <line hits="1" number="70"/>
- <line hits="1" number="71"/>
- <line hits="1" number="72"/>
- <line hits="1" number="73"/>
- <line hits="1" number="76"/>
- <line hits="1" number="77"/>
- <line hits="1" number="78"/>
- <line hits="1" number="79"/>
- <line hits="1" number="88"/>
- <line hits="1" number="89"/>
- <line hits="0" number="90"/>
- <line hits="1" number="91"/>
- <line hits="1" number="92"/>
- <line hits="1" number="93"/>
- <line hits="0" number="94"/>
- <line hits="1" number="95"/>
- <line hits="1" number="96"/>
- <line hits="1" number="97"/>
- <line hits="0" number="98"/>
- <line hits="1" number="99"/>
- <line hits="1" number="100"/>
- <line hits="1" number="101"/>
- <line hits="0" number="102"/>
- <line hits="1" number="103"/>
- <line hits="1" number="104"/>
- <line hits="1" number="105"/>
- <line hits="0" number="106"/>
- <line hits="1" number="107"/>
- <line hits="1" number="108"/>
- <line hits="1" number="109"/>
- <line hits="0" number="110"/>
- <line hits="1" number="111"/>
- <line hits="1" number="112"/>
- <line hits="1" number="113"/>
- <line hits="0" number="114"/>
- <line hits="1" number="115"/>
- <line hits="1" number="117"/>
- <line hits="1" number="119"/>
- <line hits="1" number="120"/>
- <line hits="1" number="121"/>
- <line hits="1" number="131"/>
- <line hits="1" number="132"/>
- <line hits="0" number="133"/>
- <line hits="1" number="134"/>
- <line hits="1" number="136"/>
- <line hits="1" number="137"/>
- <line hits="0" number="138"/>
- <line hits="1" number="139"/>
- <line hits="1" number="141"/>
- <line hits="1" number="142"/>
- <line hits="0" number="143"/>
- <line hits="1" number="144"/>
- <line hits="1" number="146"/>
- <line hits="1" number="147"/>
- <line hits="0" number="148"/>
- <line hits="1" number="149"/>
- <line hits="1" number="151"/>
- <line hits="1" number="152"/>
- <line hits="0" number="153"/>
- <line hits="1" number="154"/>
- <line hits="1" number="156"/>
- <line hits="1" number="157"/>
- <line hits="0" number="158"/>
- <line hits="1" number="159"/>
- <line hits="1" number="161"/>
- <line hits="1" number="162"/>
- <line hits="0" number="163"/>
- <line hits="1" number="164"/>
- <line hits="1" number="166"/>
- <line hits="1" number="167"/>
- <line hits="0" number="168"/>
- <line hits="1" number="169"/>
- <line hits="1" number="171"/>
- <line hits="1" number="173"/>
- <line hits="1" number="175"/>
- <line hits="1" number="176"/>
- <line hits="1" number="180"/>
- <line hits="1" number="182"/>
- <line hits="1" number="190"/>
- <line hits="1" number="191"/>
- <line hits="1" number="198"/>
- <line hits="0" number="204"/>
- </lines>
- </class>
- <class branch-rate="0" complexity="0" filename="mod/trapd_stats_settings.py" line-rate="1" name="trapd_stats_settings.py">
- <methods/>
- <lines>
- <line hits="1" number="16"/>
- <line hits="1" number="19"/>
- <line hits="1" number="22"/>
- <line hits="1" number="33"/>
- <line hits="1" number="36"/>
- <line hits="1" number="39"/>
- <line hits="1" number="42"/>
- </lines>
- </class>
- <class branch-rate="0" complexity="0" filename="mod/trapd_stormwatch.py" line-rate="0.7797" name="trapd_stormwatch.py">
- <methods/>
- <lines>
- <line hits="1" number="16"/>
- <line hits="1" number="23"/>
- <line hits="1" number="25"/>
- <line hits="1" number="26"/>
- <line hits="1" number="27"/>
- <line hits="1" number="28"/>
- <line hits="1" number="30"/>
- <line hits="1" number="31"/>
- <line hits="1" number="32"/>
- <line hits="1" number="33"/>
- <line hits="1" number="34"/>
- <line hits="1" number="36"/>
- <line hits="1" number="39"/>
- <line hits="1" number="59"/>
- <line hits="1" number="60"/>
- <line hits="1" number="61"/>
- <line hits="1" number="62"/>
- <line hits="1" number="63"/>
- <line hits="1" number="64"/>
- <line hits="1" number="72"/>
- <line hits="1" number="82"/>
- <line hits="1" number="83"/>
- <line hits="1" number="84"/>
- <line hits="1" number="85"/>
- <line hits="1" number="86"/>
- <line hits="1" number="87"/>
- <line hits="1" number="88"/>
- <line hits="1" number="89"/>
- <line hits="1" number="90"/>
- <line hits="1" number="91"/>
- <line hits="1" number="92"/>
- <line hits="1" number="93"/>
- <line hits="1" number="94"/>
- <line hits="1" number="95"/>
- <line hits="1" number="96"/>
- <line hits="1" number="97"/>
- <line hits="1" number="98"/>
- <line hits="1" number="99"/>
- <line hits="1" number="100"/>
- <line hits="1" number="101"/>
- <line hits="1" number="103"/>
- <line hits="1" number="104"/>
- <line hits="1" number="112"/>
- <line hits="1" number="121"/>
- <line hits="1" number="122"/>
- <line hits="1" number="123"/>
- <line hits="1" number="124"/>
- <line hits="1" number="125"/>
- <line hits="0" number="126"/>
- <line hits="0" number="127"/>
- <line hits="0" number="128"/>
- <line hits="0" number="129"/>
- <line hits="1" number="132"/>
- <line hits="1" number="135"/>
- <line hits="1" number="136"/>
- <line hits="0" number="138"/>
- <line hits="0" number="140"/>
- <line hits="1" number="141"/>
- <line hits="1" number="142"/>
- <line hits="1" number="144"/>
- <line hits="1" number="145"/>
- <line hits="1" number="148"/>
- <line hits="1" number="149"/>
- <line hits="1" number="151"/>
- <line hits="1" number="152"/>
- <line hits="0" number="153"/>
- <line hits="0" number="154"/>
- <line hits="0" number="155"/>
- <line hits="0" number="156"/>
- <line hits="1" number="159"/>
- <line hits="1" number="160"/>
- <line hits="0" number="161"/>
- <line hits="0" number="162"/>
- <line hits="0" number="163"/>
- <line hits="0" number="164"/>
- <line hits="1" number="166"/>
- <line hits="1" number="167"/>
- <line hits="1" number="169"/>
- <line hits="1" number="170"/>
- <line hits="1" number="171"/>
- <line hits="1" number="172"/>
- <line hits="1" number="174"/>
- <line hits="1" number="176"/>
- <line hits="1" number="179"/>
- <line hits="1" number="180"/>
- <line hits="1" number="182"/>
- <line hits="1" number="183"/>
- <line hits="1" number="185"/>
- <line hits="1" number="187"/>
- <line hits="1" number="190"/>
- <line hits="1" number="191"/>
- <line hits="1" number="193"/>
- <line hits="1" number="194"/>
- <line hits="1" number="196"/>
- <line hits="1" number="198"/>
- <line hits="1" number="201"/>
- <line hits="1" number="202"/>
- <line hits="1" number="203"/>
- <line hits="1" number="204"/>
- <line hits="1" number="206"/>
- <line hits="1" number="208"/>
- <line hits="1" number="210"/>
- <line hits="0" number="214"/>
- <line hits="0" number="216"/>
- <line hits="0" number="218"/>
- <line hits="0" number="219"/>
- <line hits="0" number="220"/>
- <line hits="0" number="221"/>
- <line hits="0" number="222"/>
- <line hits="1" number="224"/>
- <line hits="1" number="226"/>
- <line hits="1" number="230"/>
- <line hits="1" number="237"/>
- <line hits="1" number="249"/>
- <line hits="1" number="251"/>
- <line hits="1" number="255"/>
- <line hits="1" number="256"/>
- <line hits="1" number="258"/>
- <line hits="1" number="263"/>
- <line hits="1" number="264"/>
- <line hits="1" number="265"/>
- <line hits="1" number="266"/>
- <line hits="1" number="267"/>
- <line hits="1" number="269"/>
- <line hits="1" number="279"/>
- <line hits="1" number="295"/>
- <line hits="1" number="296"/>
- <line hits="1" number="297"/>
- <line hits="1" number="298"/>
- <line hits="1" number="299"/>
- <line hits="1" number="300"/>
- <line hits="1" number="302"/>
- <line hits="1" number="303"/>
- <line hits="1" number="304"/>
- <line hits="1" number="305"/>
- <line hits="1" number="308"/>
- <line hits="1" number="309"/>
- <line hits="1" number="310"/>
- <line hits="1" number="311"/>
- <line hits="1" number="319"/>
- <line hits="1" number="337"/>
- <line hits="1" number="340"/>
- <line hits="1" number="341"/>
- <line hits="1" number="342"/>
- <line hits="1" number="344"/>
- <line hits="1" number="345"/>
- <line hits="1" number="346"/>
- <line hits="1" number="350"/>
- <line hits="1" number="351"/>
- <line hits="1" number="352"/>
- <line hits="1" number="354"/>
- <line hits="0" number="355"/>
- <line hits="0" number="356"/>
- <line hits="1" number="359"/>
- <line hits="1" number="362"/>
- <line hits="1" number="365"/>
- <line hits="1" number="366"/>
- <line hits="1" number="367"/>
- <line hits="1" number="368"/>
- <line hits="1" number="369"/>
- <line hits="1" number="370"/>
- <line hits="1" number="372"/>
- <line hits="1" number="373"/>
- <line hits="1" number="377"/>
- <line hits="1" number="378"/>
- <line hits="1" number="380"/>
- <line hits="1" number="381"/>
- <line hits="1" number="382"/>
- <line hits="1" number="384"/>
- <line hits="1" number="385"/>
- <line hits="1" number="386"/>
- <line hits="0" number="387"/>
- <line hits="0" number="388"/>
- <line hits="0" number="390"/>
- <line hits="1" number="392"/>
- <line hits="1" number="394"/>
- <line hits="1" number="395"/>
- <line hits="1" number="403"/>
- <line hits="1" number="417"/>
- <line hits="1" number="418"/>
- <line hits="1" number="419"/>
- <line hits="1" number="421"/>
- <line hits="1" number="422"/>
- <line hits="0" number="424"/>
- <line hits="0" number="425"/>
- <line hits="0" number="426"/>
- <line hits="1" number="429"/>
- <line hits="1" number="430"/>
- <line hits="1" number="431"/>
- <line hits="1" number="432"/>
- <line hits="0" number="433"/>
- <line hits="0" number="434"/>
- <line hits="0" number="436"/>
- <line hits="1" number="452"/>
- <line hits="1" number="453"/>
- <line hits="1" number="454"/>
- <line hits="1" number="456"/>
- <line hits="1" number="458"/>
- <line hits="1" number="459"/>
- <line hits="1" number="461"/>
- <line hits="1" number="463"/>
- <line hits="0" number="465"/>
- <line hits="0" number="466"/>
- <line hits="0" number="467"/>
- <line hits="0" number="468"/>
- <line hits="0" number="470"/>
- <line hits="0" number="472"/>
- <line hits="0" number="473"/>
- <line hits="0" number="474"/>
- <line hits="0" number="475"/>
- <line hits="0" number="477"/>
- <line hits="0" number="480"/>
- <line hits="0" number="482"/>
- <line hits="0" number="484"/>
- <line hits="1" number="486"/>
- <line hits="1" number="488"/>
- <line hits="1" number="497"/>
- <line hits="1" number="512"/>
- <line hits="1" number="513"/>
- <line hits="1" number="514"/>
- <line hits="1" number="516"/>
- <line hits="1" number="518"/>
- <line hits="0" number="519"/>
- <line hits="0" number="520"/>
- <line hits="0" number="521"/>
- <line hits="0" number="523"/>
- <line hits="0" number="524"/>
- </lines>
- </class>
- <class branch-rate="0" complexity="0" filename="mod/trapd_stormwatch_settings.py" line-rate="1" name="trapd_stormwatch_settings.py">
- <methods/>
- <lines>
- <line hits="1" number="16"/>
- <line hits="1" number="19"/>
- <line hits="1" number="22"/>
- <line hits="1" number="43"/>
- <line hits="1" number="46"/>
- <line hits="1" number="49"/>
- <line hits="1" number="51"/>
- <line hits="1" number="53"/>
- <line hits="1" number="55"/>
- <line hits="1" number="58"/>
- <line hits="1" number="60"/>
- </lines>
- </class>
- <class branch-rate="0" complexity="0" filename="mod/trapd_vb_types.py" line-rate="0.7083" name="trapd_vb_types.py">
- <methods/>
- <lines>
- <line hits="1" number="16"/>
- <line hits="1" number="23"/>
- <line hits="1" number="25"/>
- <line hits="1" number="26"/>
- <line hits="1" number="27"/>
- <line hits="1" number="28"/>
- <line hits="1" number="29"/>
- <line hits="1" number="30"/>
- <line hits="1" number="31"/>
- <line hits="1" number="32"/>
- <line hits="1" number="34"/>
- <line hits="1" number="35"/>
- <line hits="1" number="36"/>
- <line hits="1" number="38"/>
- <line hits="1" number="44"/>
- <line hits="1" number="59"/>
- <line hits="1" number="62"/>
- <line hits="0" number="75"/>
- <line hits="0" number="76"/>
- <line hits="0" number="77"/>
- <line hits="0" number="78"/>
- <line hits="0" number="80"/>
- <line hits="0" number="82"/>
- <line hits="0" number="83"/>
- </lines>
- </class>
- </classes>
- </package>
- </packages>
-</coverage>
diff --git a/mvn-phase-lib.sh b/mvn-phase-lib.sh
new file mode 100644
index 0000000..938c93d
--- /dev/null
+++ b/mvn-phase-lib.sh
@@ -0,0 +1,541 @@
+#!/bin/bash
+
+# ================================================================================
+# Copyright (c) 2017-2021 AT&T 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.
+# ============LICENSE_END=========================================================
+
+
+#MVN_PROJECT_MODULEID="$1"
+#MVN_PHASE="$2"
+#PROJECT_ROOT=$(dirname $0)
+
+FQDN="${MVN_PROJECT_GROUPID}.${MVN_PROJECT_ARTIFACTID}"
+if [ "$MVN_PROJECT_MODULEID" == "__" ]; then
+ MVN_PROJECT_MODULEID=""
+fi
+
+if [[ "$MVN_PROJECT_VERSION" == *SNAPSHOT ]]; then
+ echo "=> for SNAPSHOT artifact build"
+ MVN_DEPLOYMENT_TYPE='SNAPSHOT'
+else
+ echo "=> for STAGING/RELEASE artifact build"
+ MVN_DEPLOYMENT_TYPE='STAGING'
+fi
+echo "MVN_DEPLOYMENT_TYPE is [$MVN_DEPLOYMENT_TYPE]"
+
+
+TIMESTAMP=$(date +%C%y%m%dT%H%M%S)
+
+# expected environment variables
+if [ -z "${MVN_NEXUSPROXY}" ]; then
+ echo "MVN_NEXUSPROXY environment variable not set. Cannot proceed"
+ exit
+fi
+MVN_NEXUSPROXY_HOST=$(echo "$MVN_NEXUSPROXY" |cut -f3 -d'/' | cut -f1 -d':')
+echo "=> Nexus Proxy at $MVN_NEXUSPROXY_HOST, $MVN_NEXUSPROXY"
+
+if [ -z "$WORKSPACE" ]; then
+ WORKSPACE=$(pwd)
+fi
+
+export SETTINGS_FILE=${SETTINGS_FILE:-$HOME/.m2/settings.xml}
+
+RELEASE_TAG=${MVN_RELEASE_TAG:-R8}
+if [ "$RELEASE_TAG" == "R1" ]; then
+ unset RELEASE_TAG
+fi
+
+
+# mvn phase in life cycle
+MVN_PHASE="$2"
+
+echo "MVN_RELEASE_TAG is [$MVN_RELEASE_TAG]"
+echo "MVN_PROJECT_MODULEID is [$MVN_PROJECT_MODULEID]"
+echo "MVN_PHASE is [$MVN_PHASE]"
+echo "MVN_PROJECT_GROUPID is [$MVN_PROJECT_GROUPID]"
+echo "MVN_PROJECT_ARTIFACTID is [$MVN_PROJECT_ARTIFACTID]"
+echo "MVN_PROJECT_VERSION is [$MVN_PROJECT_VERSION]"
+echo "MVN_NEXUSPROXY is [$MVN_NEXUSPROXY]"
+echo "MVN_RAWREPO_BASEURL_UPLOAD is [$MVN_RAWREPO_BASEURL_UPLOAD]"
+echo "MVN_RAWREPO_BASEURL_DOWNLOAD is [$MVN_RAWREPO_BASEURL_DOWNLOAD]"
+MVN_RAWREPO_HOST=$(echo "$MVN_RAWREPO_BASEURL_UPLOAD" | cut -f3 -d'/' |cut -f1 -d':')
+echo "MVN_RAWREPO_HOST is [$MVN_RAWREPO_HOST]"
+echo "MVN_RAWREPO_SERVERID is [$MVN_RAWREPO_SERVERID]"
+echo "MVN_DOCKERREGISTRY_SNAPSHOT is [$MVN_DOCKERREGISTRY_SNAPSHOT]"
+echo "MVN_DOCKERREGISTRY_PUBLIC is [$MVN_DOCKERREGISTRY_PUBLIC]"
+echo "MVN_DOCKERREGISTRY_RELEASE is [$MVN_DOCKERREGISTRY_RELEASE]"
+echo "MVN_PYPISERVER_SERVERID [$MVN_PYPISERVER_SERVERID]"
+echo "MVN_PYPISERVER_BASEURL is [$MVN_PYPISERVER_BASEURL]"
+
+
+
+clean_templated_files()
+{
+ TEMPLATE_FILES=$(find . -name "*-template")
+ for F in $TEMPLATE_FILES; do
+ F2=$(echo "$F" | sed 's/-template$//')
+ rm -f "$F2"
+ done
+}
+clean_tox_files()
+{
+ TOX_FILES=$(find . -name ".tox")
+ TOX_FILES="$TOX_FILES $(find . -name 'venv-tox')"
+ for F in $TOX_FILES; do
+ rm -rf "$F"
+ done
+}
+
+expand_templates()
+{
+ set +x
+ # set up env variables, get ready for template resolution
+
+ if [ -z "$RELEASE_TAG" ]; then
+ export ONAPTEMPLATE_RAWREPOURL_org_onap_dcaegen2_releases="$MVN_RAWREPO_BASEURL_DOWNLOAD/org.onap.dcaegen2/releases"
+ export ONAPTEMPLATE_RAWREPOURL_org_onap_dcaegen2_snapshots="$MVN_RAWREPO_BASEURL_DOWNLOAD/org.onap.dcaegen2/snapshots"
+ export ONAPTEMPLATE_RAWREPOURL_org_onap_dcaegen2_platform_plugins_releases="$MVN_RAWREPO_BASEURL_DOWNLOAD/org.onap.dcaegen2.platform.plugins/releases"
+ export ONAPTEMPLATE_RAWREPOURL_org_onap_dcaegen2_platform_plugins_snapshots="$MVN_RAWREPO_BASEURL_DOWNLOAD/org.onap.dcaegen2.platform.plugins/snapshots"
+ export ONAPTEMPLATE_RAWREPOURL_org_onap_dcaegen2_platform_blueprints_releases="$MVN_RAWREPO_BASEURL_DOWNLOAD/org.onap.dcaegen2.platform.blueprints/releases"
+ export ONAPTEMPLATE_RAWREPOURL_org_onap_dcaegen2_platform_blueprints_snapshots="$MVN_RAWREPO_BASEURL_DOWNLOAD/org.onap.dcaegen2.platform.blueprints/snapshots"
+ else
+ export ONAPTEMPLATE_RAWREPOURL_org_onap_dcaegen2_releases="$MVN_RAWREPO_BASEURL_DOWNLOAD/org.onap.dcaegen2/$RELEASE_TAG"
+ export ONAPTEMPLATE_RAWREPOURL_org_onap_dcaegen2_snapshots="$MVN_RAWREPO_BASEURL_DOWNLOAD/org.onap.dcaegen2/$RELEASE_TAG"
+ export ONAPTEMPLATE_RAWREPOURL_org_onap_dcaegen2_platform_plugins_releases="$MVN_RAWREPO_BASEURL_DOWNLOAD/org.onap.dcaegen2.platform.plugins/$RELEASE_TAG"
+ export ONAPTEMPLATE_RAWREPOURL_org_onap_dcaegen2_platform_plugins_snapshots="$MVN_RAWREPO_BASEURL_DOWNLOAD/org.onap.dcaegen2.platform.plugins/$RELEASE_TAG"
+ export ONAPTEMPLATE_RAWREPOURL_org_onap_dcaegen2_platform_blueprints_releases="$MVN_RAWREPO_BASEURL_DOWNLOAD/org.onap.dcaegen2.platform.blueprints/$RELEASE_TAG"
+ export ONAPTEMPLATE_RAWREPOURL_org_onap_dcaegen2_platform_blueprints_snapshots="$MVN_RAWREPO_BASEURL_DOWNLOAD/org.onap.dcaegen2.platform.blueprints/$RELEASE_TAG"
+ fi
+
+
+ export ONAPTEMPLATE_PYPIURL_org_onap_dcaegen2="${MVN_PYPISERVER_BASEURL}"
+
+ # docker registry templates are for poll, so use PUBLIC registry
+ export ONAPTEMPLATE_DOCKERREGURL_org_onap_dcaegen2_releases="${MVN_DOCKERREGISTRY_PUBLIC}"
+ export ONAPTEMPLATE_DOCKERREGURL_org_onap_dcaegen2_snapshots="${MVN_DOCKERREGISTRY_PUBLIC}"
+
+ # Mvn repo
+ export ONAPTEMPLATE_MVN_org_onap_dcaegen2_analytics_tca_snapshots="${MVN_NEXUSPROXY}/service/local/repositories/snapshots/content/org/onap/dcaegen2/analytics/tca"
+ export ONAPTEMPLATE_MVN_org_onap_dcaegen2_analytics_tca_staging="${MVN_NEXUSPROXY}/service/local/repositories/staging/content/org/onap/dcaegen2/analytics/tca"
+ export ONAPTEMPLATE_MVN_org_onap_dcaegen2_analytics_tca_releases="${MVN_NEXUSPROXY}/service/local/repositories/releases/content/org/onap/dcaegen2/analytics/tca"
+
+
+ export ONAPTEMPLATE_STANDARD_INPUTS_TYPES=" # standard inputs list
+ centos7image_id:
+ type: string
+ ubuntu1604image_id:
+ type: string
+ flavor_id:
+ type: string
+ security_group:
+ type: string
+ public_net:
+ type: string
+ private_net:
+ type: string
+ openstack: {}
+ keypair:
+ type: string
+ key_filename:
+ type: string
+ location_prefix:
+ type: string
+ location_domain:
+ type: string
+ codesource_url:
+ type: string
+ codesource_version:
+ type: string"
+
+
+ TEMPLATES=$(env |grep ONAPTEMPLATE | sed 's/=.*//' | sort -u)
+ if [ -z "$TEMPLATES" ]; then
+ echo "No template variables found!"
+ return 0
+ fi
+
+ TEMPLATE_FILES=$(find . -name "*-template")
+ for F in $TEMPLATE_FILES; do
+ F2=$(echo "$F" | sed 's/-template$//')
+ cp -p "$F" "$F2"
+ chmod u+w "$F2"
+
+ echo "====> Resolving the following template from environment variables "
+ echo "$TEMPLATES"
+ for KEY in $TEMPLATES; do
+ VALUE1=$(eval 'echo "$'"$KEY"'"' | sed 1q)
+ VALUE2=$(eval 'echo "$'"$KEY"'"' | sed -e 's/\//\\\//g' -e 's/$/\\/' -e '$s/\\$//')
+
+ echo "======> Resolving template $KEY to value $VALUE1 for file $F2"
+ sed -i "s/{{[[:space:]]*$KEY[[:space:]]*}}/$VALUE2/g" "$F2"
+ done
+ done
+ echo "====> Done template resolving"
+}
+
+test_templates()
+{
+ # make certain that the type references exist
+ TMP=$(mktemp)
+ trap 'rm -f $TMP' 0 1 2 3 15
+
+ echo Verify that all of the import URLs are correct
+ find . -name '*-template' | sed -e 's/-template$//' |
+ while read file
+ do
+ egrep '^ - .?https?://' < "$file"
+ done | awk '{print $2}' | sed -e 's/"//g' | sort -u |
+ while read url
+ do
+ curl -L -w '%{http_code}' -s -o /dev/null "$url" > "$TMP"
+ case $(< "$TMP") in
+ 2* ) ;;
+ * ) echo ">>>>>>>>>>>>>>>> $url not found <<<<<<<<<<<<<<<<" ;;
+ esac
+ done
+
+ echo Verify that the inputs are correct
+ PATH=$PATH:$PWD/check-blueprint-vs-input/bin
+ find . -name '*-template' | sed -e 's/-template$//' |
+ while read blueprint
+ do
+ check-blueprint-vs-input -b "$blueprint" -i check-blueprint-vs-input/lib/sample-inputs.yaml || true
+ done
+}
+
+
+run_tox_test()
+{
+ set -e -x
+ CURDIR=$(pwd)
+ TOXINIS=$(find . -name "tox.ini")
+ for TOXINI in "${TOXINIS[@]}"; do
+ DIR=$(echo "$TOXINI" | rev | cut -f2- -d'/' | rev)
+ cd "${CURDIR}/${DIR}"
+ rm -rf ./venv-tox ./.tox
+ python3.9 -m virtualenv ./venv-tox
+ source ./venv-tox/bin/activate
+ pip install pip==9.0.3
+ pip install --upgrade argparse
+ pip install tox==2.9.1
+ pip freeze
+ tox
+ deactivate
+ rm -rf ./venv-tox ./.tox
+ done
+}
+
+build_wagons()
+{
+ rm -rf ./*.wgn venv-pkg
+ SETUPFILES=$(find . -name "setup.py")
+
+ virtualenv ./venv-pkg
+ source ./venv-pkg/bin/activate
+ pip install --upgrade pip
+ pip install wagon
+
+ CURDIR=$(pwd)
+ for SETUPFILE in $SETUPFILES; do
+ PLUGIN_DIR=$(dirname "$SETUPFILE")
+ PLUGIN_NAME=$(grep 'name' "$SETUPFILE" | cut -f2 -d'=' | sed 's/[^0-9a-zA-Z\.]*//g')
+ PLUGIN_VERSION=$(grep 'version' "$SETUPFILE" | cut -f2 -d'=' | sed 's/[^0-9\.]*//g')
+
+ echo "In $PLUGIN_DIR, build plugin $PLUGIN_NAME, version $PLUGIN_VERSION"
+
+ wagon create -r "${PLUGIN_DIR}/requirements.txt" --format tar.gz "${PLUGIN_DIR}"
+
+ PKG_FILE_NAMES=( "${PLUGIN_NAME}-${PLUGIN_VERSION}"*.wgn )
+ echo Built package: "${PKG_FILE_NAMES[@]}"
+ cd "$CURDIR"
+ done
+
+ deactivate
+ rm -rf venv-pkg
+}
+
+build_archives_for_wagons()
+{
+ rm -rf ./*.tgz ./*.zip venv-pkg
+
+ SETUPFILES=$(find "$(pwd)" -name "setup.py")
+ CURDIR=$(pwd)
+ for SETUPFILE in $SETUPFILES; do
+ PLUGIN_FULL_DIR=$(dirname "$SETUPFILE")
+ PLUGIN_BASE_DIR=$(basename "$PLUGIN_FULL_DIR")
+ PLUGIN_NAME=$(grep 'name' "$SETUPFILE" | cut -f2 -d'=' | sed 's/[^0-9a-zA-Z\.]*//g')
+ PLUGIN_VERSION=$(grep 'version' "$SETUPFILE" | cut -f2 -d'=' | sed 's/[^0-9\.]*//g')
+
+ cd "${PLUGIN_FULL_DIR}"/..
+ echo "In $(pwd), build plugin zip $PLUGIN_NAME, version $PLUGIN_VERSION"
+
+ zip -r "${PLUGIN_NAME}-${PLUGIN_VERSION}.zip" "./${PLUGIN_BASE_DIR}"
+ tar -czvf "${PLUGIN_NAME}-${PLUGIN_VERSION}.tgz" "./${PLUGIN_BASE_DIR}"
+
+ echo "Built archives for package ${PLUGIN_NAME}-${PLUGIN_VERSION} at $(pwd)"
+ cd "$CURDIR"
+ done
+}
+
+
+upload_raw_file()
+{
+ # Extract the username and password to the nexus repo from the settings file
+ USER=$(xpath -q -e "//servers/server[id='$MVN_RAWREPO_SERVERID']/username/text()" "$SETTINGS_FILE")
+ PASS=$(xpath -q -e "//servers/server[id='$MVN_RAWREPO_SERVERID']/password/text()" "$SETTINGS_FILE")
+ NETRC=$(mktemp)
+ echo "machine $MVN_RAWREPO_HOST login $USER password $PASS" > "$NETRC"
+
+ REPO="$MVN_RAWREPO_BASEURL_UPLOAD"
+
+ OUTPUT_FILE=$1
+ EXT=$(echo "$OUTPUT_FILE" | rev |cut -f1 -d '.' |rev)
+ if [ "$EXT" == 'yaml' ]; then
+ OUTPUT_FILE_TYPE='text/x-yaml'
+ elif [ "$EXT" == 'sh' ]; then
+ OUTPUT_FILE_TYPE='text/x-shellscript'
+ elif [ "$EXT" == 'gz' ]; then
+ OUTPUT_FILE_TYPE='application/gzip'
+ elif [ "$EXT" == 'tgz' ]; then
+ OUTPUT_FILE_TYPE='application/gzip'
+ elif [ "$EXT" == 'zip' ]; then
+ OUTPUT_FILE_TYPE='application/zip'
+ elif [ "$EXT" == 'wgn' ]; then
+ OUTPUT_FILE_TYPE='application/gzip'
+ else
+ OUTPUT_FILE_TYPE='application/octet-stream'
+ fi
+
+ # for multi module projects, the raw repo path must match with project name, not project + module
+ # FQDN is project + module
+ # GROUPID is project name
+ if [ "$MVN_PROJECT_ARTIFACTID" == "$MVN_PROJECT_MODULEID" ]; then
+ PROJECT_NAME=${MVN_PROJECT_GROUPID}
+ else
+ PROJECT_NAME=${FQDN}
+ fi
+
+ if [ -z "$RELEASE_TAG" ]; then
+ SEND_TO="${REPO}/${PROJECT_NAME}"
+ else
+ SEND_TO="${REPO}/${PROJECT_NAME}/${RELEASE_TAG}"
+ fi
+
+ if [ ! -z "$2" ]; then
+ SEND_TO="$SEND_TO/$2"
+ fi
+
+ echo "Sending ${OUTPUT_FILE} to Nexus: ${SEND_TO}"
+ curl -vkn --netrc-file "${NETRC}" --upload-file "${OUTPUT_FILE}" -X PUT -H "Content-Type: $OUTPUT_FILE_TYPE" "${SEND_TO}/${OUTPUT_FILE}-${TIMESTAMP}"
+ curl -vkn --netrc-file "${NETRC}" --upload-file "${OUTPUT_FILE}" -X PUT -H "Content-Type: $OUTPUT_FILE_TYPE" "${SEND_TO}/${OUTPUT_FILE}"
+}
+
+upload_wagon_archives()
+{
+ SETUPFILES=$(find "$(pwd)" -name "setup.py")
+ CURDIR=$(pwd)
+ for SETUPFILE in $SETUPFILES; do
+ PLUGIN_FULL_DIR=$(dirname "$SETUPFILE")
+ PLUGIN_BASE_DIR=$(basename "$PLUGIN_FULL_DIR")
+ PLUGIN_NAME=$(grep 'name' "$SETUPFILE" | cut -f2 -d'=' | sed 's/[^0-9a-zA-Z\.]*//g')
+ PLUGIN_VERSION=$(grep 'version' "$SETUPFILE" | cut -f2 -d'=' | sed 's/[^0-9\.]*//g')
+
+ cd "${PLUGIN_FULL_DIR}"/..
+ echo "In $(pwd), upload zip archive for $PLUGIN_NAME, version $PLUGIN_VERSION"
+ ARCHIVE_FILE_NAME="${PLUGIN_NAME}-${PLUGIN_VERSION}.zip"
+ if [ -z "$ARCHIVE_FILE_NAME" ]; then
+ echo "!!! No zip archive file found ${ARCHIVE_FILE_NAME}"
+ exit -1
+ fi
+ upload_raw_file "${ARCHIVE_FILE_NAME}" "${PLUGIN_NAME}/${PLUGIN_VERSION}"
+
+ echo "In $(pwd), upload tgz archive for $PLUGIN_NAME, version $PLUGIN_VERSION"
+ ARCHIVE_FILE_NAME="${PLUGIN_NAME}-${PLUGIN_VERSION}.tgz"
+ if [ -z "$ARCHIVE_FILE_NAME" ]; then
+ echo "!!! No tgz archive file found ${ARCHIVE_FILE_NAME}"
+ exit -1
+ fi
+ upload_raw_file "${ARCHIVE_FILE_NAME}" "${PLUGIN_NAME}/${PLUGIN_VERSION}"
+
+ cd "${CURDIR}"
+ done
+}
+
+upload_wagons_and_type_yamls()
+{
+ SETUPFILES=$(find . -name "setup.py")
+
+ CURDIR=$(pwd)
+ for SETUPFILE in $SETUPFILES; do
+ PLUGIN_DIR=$(dirname "$SETUPFILE")
+ PLUGIN_NAME=$(grep 'name' "$SETUPFILE" | cut -f2 -d'=' | sed 's/[^0-9a-zA-Z\.]*//g')
+ PLUGIN_VERSION=$(grep 'version' "$SETUPFILE" | cut -f2 -d'=' | sed 's/[^0-9\.]*//g')
+ PLUGIN_VERSION_MAJOR=$(echo "$PLUGIN_VERSION" | cut -f1 -d'.')
+ PLUGIN_VERSION_MAJOR_MINOR=$(echo "$PLUGIN_VERSION" | cut -f1-2 -d'.')
+
+ echo "Found setup file in $PLUGIN_DIR, for plugin $PLUGIN_NAME version $PLUGIN_VERSION"
+
+ TYPEFILE_NAME=$(grep -R "package_name:[[:space:]]*${PLUGIN_NAME}" | cut -f1 -d ':')
+ if [ -z "$TYPEFILE_NAME" ]; then
+ echo "!!! No typefile found with matching package name $PLUGIN_NAME"
+ exit -1
+ fi
+ NEWFILENAME="${PLUGIN_NAME}"_types.yaml
+ if [ "$TYPEFILE_NAME" != "$NEWFILENAME" ]; then
+ echo "copy typefile to standard naming"
+ cp -f "$TYPEFILE_NAME" "$NEWFILENAME"
+ fi
+
+ TYPEFILE_PACKAGE_VERSION=$(grep -R 'package_version' "$TYPEFILE_NAME" |cut -f2 -d ':' |sed -r 's/\s+//g')
+ WAGONFILE_NAME=$(ls -1 "${PLUGIN_NAME}"-"${TYPEFILE_PACKAGE_VERSION}"-*.wgn)
+ if [ -z "$WAGONFILE_NAME" ]; then
+ echo "!!! No wagonfile found with matching package name and version as required in typefile: "
+ echo " $TYPEFILE_NAME plugin $PLUGIN_NAME package version ${TYPEFILE_PACKAGE_VERSION}"
+ exit -1
+ fi
+
+ upload_raw_file "${NEWFILENAME}" "${PLUGIN_NAME}/${PLUGIN_VERSION}"
+ upload_raw_file "${WAGONFILE_NAME}" "${PLUGIN_NAME}/${PLUGIN_VERSION}"
+
+ rm -r "$WAGONFILE_NAME"
+ if [ "$TYPEFILE_NAME" != "$NEWFILENAME" ]; then
+ rm -f "$NEWFILENAME"
+ fi
+ done
+}
+
+upload_files_of_extension()
+{
+ FILES=$(ls -1 ./*."$1")
+ for F in $FILES ; do
+ upload_raw_file "$F" "$2"
+ done
+}
+upload_files_of_extension_recursively()
+{
+ FILES=$(find . -name "*.$1")
+ for F in $FILES ; do
+ upload_raw_file "$F" "$2"
+ done
+}
+
+
+generate_pypirc_then_publish()
+{
+ set +x
+ USER=$(xpath -e "//servers/server[id='$MVN_PYPISERVER_SERVERID']/username/text()" "$SETTINGS_FILE")
+ PASS=$(xpath -e "//servers/server[id='$MVN_PYPISERVER_SERVERID']/password/text()" "$SETTINGS_FILE")
+
+ if [[ "$MVN_PYPISERVER_BASEURL" != */ ]]; then
+ MVN_PYPISERVER_BASEURL="${MVN_PYPISERVER_BASEURL}/"
+ fi
+
+
+ cat > ~/.pypirc <<EOL
+[distutils]
+index-servers =
+ $MVN_PYPISERVER_SERVERID
+
+[$MVN_PYPISERVER_SERVERID]
+repository: $MVN_PYPISERVER_BASEURL
+username: $USER
+password: $PASS
+EOL
+
+ # this may fail if a package of same version exists
+ python setup.py sdist register -r "$MVN_PYPISERVER_SERVERID" upload -r "$MVN_PYPISERVER_SERVERID"
+ set -x
+}
+
+
+
+# following the https://wiki.onap.org/display/DW/Independent+Versioning+and+Release+Process
+#IndependentVersioningandReleaseProcess-StandardizedDockerTagging
+build_and_push_docker()
+{
+ # Old tagging
+ #IMAGENAME="onap/${FQDN}.${MVN_PROJECT_MODULEID}"
+ # new tagging
+ ENDID=$(echo $FQDN | rev | cut -f1 -d '.' |rev)
+ if [ "$ENDID" == "${MVN_PROJECT_MODULEID}" ]; then
+ #IMAGENAME="onap/${FQDN/org.onap./}"
+ IMAGENAME="onap/${FQDN}"
+ else
+ #IMAGENAME="onap/${FQDN/org.onap./}.${MVN_PROJECT_MODULEID}"
+ IMAGENAME="onap/${FQDN}.${MVN_PROJECT_MODULEID}"
+ fi
+
+ IMAGENAME=$(echo "$IMAGENAME" | sed -e 's/_*$//g' -e 's/\.*$//g')
+ IMAGENAME=$(echo "$IMAGENAME" | tr '[:upper:]' '[:lower:]')
+
+ # use the major and minor version of the MVN artifact version as docker image version
+ VERSION="${MVN_PROJECT_VERSION//[^0-9.]/}"
+ VERSION2=$(echo "$VERSION" | cut -f1-2 -d'.')
+
+ LFQI="${IMAGENAME}:${VERSION}-${TIMESTAMP}"Z
+ # build a docker image
+ docker build --rm -f ./Dockerfile -t "${LFQI}" ./
+
+ # all local builds push to SNAPSHOT repo
+ REPO=""
+ if [ $MVN_DEPLOYMENT_TYPE == "SNAPSHOT" ]; then
+ REPO=$MVN_DOCKERREGISTRY_SNAPSHOT
+ elif [ $MVN_DEPLOYMENT_TYPE == "STAGING" ]; then
+ REPO=$MVN_DOCKERREGISTRY_SNAPSHOT
+ else
+ echo "Fail to determine DEPLOYMENT_TYPE"
+ REPO=$MVN_DOCKERREGISTRY_SNAPSHOT
+ fi
+ echo "DEPLOYMENT_TYPE is: $MVN_DEPLOYMENT_TYPE, repo is $REPO"
+
+ if [ ! -z "$REPO" ]; then
+ USER=$(xpath -e "//servers/server[id='$REPO']/username/text()" "$SETTINGS_FILE")
+ PASS=$(xpath -e "//servers/server[id='$REPO']/password/text()" "$SETTINGS_FILE")
+ if [ -z "$USER" ]; then
+ echo "Error: no user provided"
+ fi
+ if [ -z "$PASS" ]; then
+ echo "Error: no password provided"
+ fi
+ [ -z "$PASS" ] && PASS_PROVIDED="<empty>" || PASS_PROVIDED="<password>"
+ echo docker login "$REPO" -u "$USER" -p "$PASS_PROVIDED"
+
+ set +x
+ docker login "$REPO" -u "$USER" -p "$PASS"
+ set -x
+
+ # local tag is imagename:version-timestamp
+ OLDTAG="${LFQI}"
+ # three tags are pushed:
+ # {imagename}:{semver}-SNAPSHOT-{timestamp}Z this is what CIMAN-132 asks
+ # {imagename}:{semver} latest of current version, for testing
+ # {imagename}:latest latest of all, used mainly by csit
+ # LFQI="${IMAGENAME}:${VERSION}-${TIMESTAMP}"Z
+
+
+
+ # Updating tags for ${REPO}/${IMAGENAME}:${VERSION} to include STAGING-latest; and adding new tag for major:minor-STAGING-latest
+ PUSHTAGS="${REPO}/${IMAGENAME}:${VERSION}-SNAPSHOT-${TIMESTAMP}Z ${REPO}/${IMAGENAME}:${VERSION2}-STAGING-latest ${REPO}/${IMAGENAME}:${VERSION}-STAGING-latest ${REPO}/${IMAGENAME}:latest"
+
+ for NEWTAG in ${PUSHTAGS}
+ do
+ echo "tagging ${OLDTAG} to ${NEWTAG}"
+ docker tag "${OLDTAG}" "${NEWTAG}"
+ echo "pushing ${NEWTAG}"
+ docker push "${NEWTAG}"
+ OLDTAG="${NEWTAG}"
+ done
+ fi
+}
diff --git a/mvn-phase-script.sh b/mvn-phase-script.sh
index 02d7470..489a3b4 100755
--- a/mvn-phase-script.sh
+++ b/mvn-phase-script.sh
@@ -35,14 +35,16 @@ if [ "$RELEASE_TAG" != "R1" ]; then
else
RELEASE_TAGGED_DIR=""
fi
-if ! wget -O ${PROJECT_ROOT}/mvn-phase-lib.sh \
- "$MVN_RAWREPO_BASEURL_DOWNLOAD"/org.onap.dcaegen2.utils/${RELEASE_TAGGED_DIR}scripts/mvn-phase-lib.sh; then
- echo "Fail to download mvn-phase-lib.sh"
- exit 1
-fi
+
+source "${PROJECT_ROOT}"/mvn-phase-lib.sh
+#if ! wget -O ${PROJECT_ROOT}/mvn-phase-lib.sh \
+# "$MVN_RAWREPO_BASEURL_DOWNLOAD"/org.onap.dcaegen2.utils/${RELEASE_TAGGED_DIR}scripts/mvn-phase-lib.sh; then
+# echo "Fail to download mvn-phase-lib.sh"
+# exit 1
+#fi
-source ./mvn-phase-lib.sh
+source ./mvn-phase-lib.sh
# Customize the section below for each project
diff --git a/requirements.txt b/requirements.txt
index 434db5c..45b1e24 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,3 +1,3 @@
-pysnmp==4.4.5
+pysnmp==4.4.12
requests==2.18.3
onap_dcae_cbs_docker_client==2.1.0
diff --git a/setup.py b/setup.py
index 4ce8c88..aab406b 100644
--- a/setup.py
+++ b/setup.py
@@ -1,6 +1,7 @@
# org.onap.dcae
# ================================================================================
# Copyright (c) 2017-2018 AT&T Intellectual Property. All rights reserved.
+# Copyright 2021 Deutsche Telekom. 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.
@@ -27,10 +28,10 @@ from setuptools import setup, find_packages
setup(
name = "snmptrap",
description = "snmp trap receiver for ONAP docker image",
- version = "2.0.3",
+ version = "2.0.4",
packages=find_packages(),
install_requires=[
- "pysnmp==4.4.2",
+ "pysnmp==4.4.12",
"requests==2.18.3",
"onap_dcae_cbs_docker_client==2.1.0"
],
diff --git a/tox.ini b/tox.ini
index 8d138ea..9013c37 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,6 +1,7 @@
# content of: tox.ini , put in same dir as setup.py
[tox]
-envlist = py36
+envlist = py36,py37,py38,py39
+skip_missing_interpreters = true
[testenv]
deps=
diff --git a/version.properties b/version.properties
index c8a67b0..45de691 100644
--- a/version.properties
+++ b/version.properties
@@ -1,6 +1,6 @@
major=2
minor=0
-patch=3
+patch=4
base_version=${major}.${minor}.${patch}
release_version=${base_version}
snapshot_version=${base_version}-SNAPSHOT