summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Changelog.md5
-rw-r--r--Dockerfile6
-rw-r--r--pom.xml5
-rw-r--r--requirements.txt3
-rw-r--r--setup.py5
-rw-r--r--version.properties2
6 files changed, 18 insertions, 8 deletions
diff --git a/Changelog.md b/Changelog.md
index c102c46..4f23dcb 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -4,6 +4,11 @@ All notable changes to this project will be documented in this file.
The format is based on [Keep a Changelog](http://keepachangelog.com/)
and this project adheres to [Semantic Versioning](http://semver.org/).
+## [2.0.8] - 2023/11/15
+- [DCAEGEN2-3409] Correctly use version 2.2.1 of onap_dcae_cbs_docker_client by specifying it in requirements.txt
+- [DCAEGEN2-3409] Explicitly set version for pyasn1 to 0.4.8 to avoid using later versions that are incompatible with pysnmp.
+- [DCAEGEN2-3409] Set base image to pypy:3.8 to avoid pulling a later version of python with incompatibilities.
+
## [2.0.7] - 2022/08/17
- [DCAEGEN2-3158] CodeCoverage improvement for dcaegen2-collectors-snmptrap (60% to 90%)
diff --git a/Dockerfile b/Dockerfile
index 6a79013..49a749d 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,5 +1,7 @@
+# Copyright (c) 2023 J. F. Lucas. All rights reserved.
+# (Previous versions by other authors did not have copyright notice.)
# Use an official pypy runtime as a base image
-FROM pypy:3
+FROM pypy:3.8
ENV INSROOT /opt/app
ENV APPUSER snmptrap
@@ -14,7 +16,7 @@ RUN useradd -d ${APPDIR} ${APPUSER}
WORKDIR ${APPDIR}
-EXPOSE 162:6162/udp
+EXPOSE 6162/udp
# Copy the current directory contents into the container at ${APPDIR}
COPY ./snmptrap/ ./bin/
diff --git a/pom.xml b/pom.xml
index d180e03..2d10e19 100644
--- a/pom.xml
+++ b/pom.xml
@@ -2,6 +2,7 @@
<!--
============LICENSE_START=======================================================
Copyright (c) 2017-2022 AT&T Intellectual Property. All rights reserved.
+Copyright (c) 2023 J. F. Lucas. 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.
@@ -30,7 +31,7 @@ ECOMP is a trademark and service mark of AT&T Intellectual Property.
<groupId>org.onap.dcaegen2.collectors</groupId>
<artifactId>snmptrap</artifactId>
<name>dcaegen2-collectors-snmptrap</name>
- <version>2.0.7-SNAPSHOT</version>
+ <version>2.0.8-SNAPSHOT</version>
<url>http://maven.apache.org</url>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -105,7 +106,7 @@ ECOMP is a trademark and service mark of AT&T Intellectual Property.
</execution>
</executions>
</plugin>
- <!-- maven-install-plugin is called during "install" phase by default behavior. it tries to copy stuff under
+ <!-- maven-install-plugin is called during "install" phase by default behavior. it tries to copy stuff under
target dir to ~/.m2. we do not need it -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
diff --git a/requirements.txt b/requirements.txt
index a55cd16..793d2a2 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,4 +1,5 @@
pysnmp==4.4.12
+pyasn1==0.4.8
requests==2.18.3
-onap_dcae_cbs_docker_client==2.1.0
+onap_dcae_cbs_docker_client==2.2.1
pyyaml
diff --git a/setup.py b/setup.py
index 0fb95b0..abac4f3 100644
--- a/setup.py
+++ b/setup.py
@@ -1,6 +1,7 @@
# ============LICENSE_START=======================================================
# Copyright (c) 2017-2022 AT&T Intellectual Property. All rights reserved.
# Copyright (c) 2021 Deutsche Telekom. All rights reserved.
+# Copyright (c) 2023 J. F. Lucas. 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.
@@ -25,9 +26,9 @@ from setuptools import setup, find_packages
setup(
name="snmptrap",
description="snmp trap receiver for ONAP docker image",
- version="2.0.7",
+ version="2.0.8",
packages=find_packages(),
- install_requires=["pysnmp==4.4.12", "requests==2.18.3", "onap_dcae_cbs_docker_client==2.2.1", "pyyaml"],
+ install_requires=["pysnmp==4.4.12", "pyasn1==0.4.8", "requests==2.18.3", "onap_dcae_cbs_docker_client==2.2.1", "pyyaml"],
author="Dave L",
author_email="dl3158@att.com",
license="Apache 2",
diff --git a/version.properties b/version.properties
index a640c99..02713b8 100644
--- a/version.properties
+++ b/version.properties
@@ -1,6 +1,6 @@
major=2
minor=0
-patch=7
+patch=8
base_version=${major}.${minor}.${patch}
release_version=${base_version}
snapshot_version=${base_version}-SNAPSHOT