diff options
| -rw-r--r-- | .gitreview | 4 | ||||
| -rw-r--r-- | docs/conf.py | 2 | ||||
| -rw-r--r-- | docs/requirements-docs.txt | 14 | ||||
| -rw-r--r-- | docs/tox.ini | 5 | ||||
| -rw-r--r-- | engine-d-standalone/src/main/assembly/dbscripts/postgresql/onap-holmes_engine-createobj.sql | 4 | ||||
| -rw-r--r-- | engine-d/src/main/java/org/onap/holmes/dsa/dmaappolling/Subscriber.java | 9 |
6 files changed, 17 insertions, 21 deletions
diff --git a/.gitreview b/.gitreview new file mode 100644 index 0000000..3fecedf --- /dev/null +++ b/.gitreview @@ -0,0 +1,4 @@ +[gerrit] +host=gerrit.onap.org +port=29418 +project=holmes/engine-management.git diff --git a/docs/conf.py b/docs/conf.py index 5371015..d211470 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -12,4 +12,4 @@ intersphinx_mapping = {} html_last_updated_fmt = '%d-%b-%y %H:%M' def setup(app): - app.add_stylesheet("css/ribbon.css") + app.add_css_file("css/ribbon.css") diff --git a/docs/requirements-docs.txt b/docs/requirements-docs.txt index b3188dd..74a3b7a 100644 --- a/docs/requirements-docs.txt +++ b/docs/requirements-docs.txt @@ -1,15 +1 @@ -tox -Sphinx -doc8 -docutils -setuptools -six -sphinx_rtd_theme>=0.4.3 -sphinxcontrib-blockdiag -sphinxcontrib-needs>=0.2.3 -sphinxcontrib-nwdiag -sphinxcontrib-seqdiag -sphinxcontrib-swaggerdoc -sphinxcontrib-plantuml -sphinx_bootstrap_theme lfdocs-conf diff --git a/docs/tox.ini b/docs/tox.ini index edac8c3..42ffa68 100644 --- a/docs/tox.ini +++ b/docs/tox.ini @@ -5,7 +5,10 @@ skipsdist = true [testenv:docs] basepython = python3 -deps = -r{toxinidir}/requirements-docs.txt +deps = + -r{toxinidir}/requirements-docs.txt + -chttps://git.onap.org/doc/plain/etc/upper-constraints.os.txt + -chttps://git.onap.org/doc/plain/etc/upper-constraints.onap.txt commands = sphinx-build -b html -n -d {envtmpdir}/doctrees ./ {toxinidir}/_build/html echo "Generated docs available in {toxinidir}/_build/html" diff --git a/engine-d-standalone/src/main/assembly/dbscripts/postgresql/onap-holmes_engine-createobj.sql b/engine-d-standalone/src/main/assembly/dbscripts/postgresql/onap-holmes_engine-createobj.sql index 6831ce2..a3975b3 100644 --- a/engine-d-standalone/src/main/assembly/dbscripts/postgresql/onap-holmes_engine-createobj.sql +++ b/engine-d-standalone/src/main/assembly/dbscripts/postgresql/onap-holmes_engine-createobj.sql @@ -25,9 +25,7 @@ CREATE ROLE DBUSER with PASSWORD 'DBPWD' LOGIN; /******************DELETE OLD TABLE AND CREATE NEW***************************/ \c DBNAME; -DROP TABLE IF EXISTS ALARM_INFO; - -CREATE TABLE ALARM_INFO ( +CREATE TABLE IF NOT EXISTS ALARM_INFO ( EVENTID VARCHAR(150) NOT NULL, EVENTNAME VARCHAR(150) NOT NULL, ALARMISCLEARED SMALLINT NOT NULL, diff --git a/engine-d/src/main/java/org/onap/holmes/dsa/dmaappolling/Subscriber.java b/engine-d/src/main/java/org/onap/holmes/dsa/dmaappolling/Subscriber.java index 8c3d4f5..af772fb 100644 --- a/engine-d/src/main/java/org/onap/holmes/dsa/dmaappolling/Subscriber.java +++ b/engine-d/src/main/java/org/onap/holmes/dsa/dmaappolling/Subscriber.java @@ -88,8 +88,13 @@ public class Subscriber { private List<VesAlarm> extractVesAlarm(List<String> responseEntity) { List<VesAlarm> vesAlarmList = new ArrayList<>(); for (String entity : responseEntity) { - vesAlarmList.add(dMaaPResponseUtil.convertJsonToVesAlarm(entity)); - } + try { + vesAlarmList.add(dMaaPResponseUtil.convertJsonToVesAlarm(entity)); + } catch (Exception e) { + log.error("Failed to convert the response data to VES alarm ", e); + //Continue with other events + } + } return vesAlarmList; } } |