diff options
| author |   Brian Freeman <bf1936@att.com> | 2020-05-21 14:54:06 +0000 |
|---|---|---|
| committer | Brian Freeman <bf1936@att.com> | 2020-05-21 15:29:20 +0000 |
| commit | 2892dcf9b4d8f11e923d8f11699e0d7e776d31e9 (patch) | |
| tree | b47fd34edb1634228322b43a8841a127f4bef12f /vnfs | |
| parent | bbabc30d68b8bf47763d6d8f7b99b95ee6f82900 (diff) | |
Fix lint and systemctl issues
removed vFWCL_DANOS since it was repalced with shorter VFWCLDN
Issue-ID: INT-1566
Change-Id: I3d928795e903b584d4d6ca9f1bf631e692317ee8
Signed-off-by: Brian Freeman <bf1936@att.com>
Diffstat (limited to 'vnfs')
6 files changed, 11 insertions, 7 deletions
diff --git a/vnfs/VESreporting_vFW5.0_DANOS/.gitignore b/vnfs/VESreporting_vFW5.0_DANOS/.gitignore new file mode 100644 index 00000000..dc8ecde3 --- /dev/null +++ b/vnfs/VESreporting_vFW5.0_DANOS/.gitignore @@ -0,0 +1,2 @@ +**/*.so +**/*.a diff --git a/vnfs/VESreporting_vFW5.0_DANOS/Makefile b/vnfs/VESreporting_vFW5.0_DANOS/Makefile index 160c0264..2fdb368a 100644 --- a/vnfs/VESreporting_vFW5.0_DANOS/Makefile +++ b/vnfs/VESreporting_vFW5.0_DANOS/Makefile @@ -37,7 +37,7 @@ all: evel \ clean: rm -f vpp-measurement-reporter-danos -vpp-measurement-reporter-danos: evel vpp-measurement-reporter-danos.c +vpp-measurement-reporter-danos: ${LIBS_DIR}/evel.so vpp-measurement-reporter-danos.c $(CC) $(CPPFLAGS) $(CFLAGS) -o vpp-measurement-reporter-danos \ -L $(LIBS_DIR) \ -I $(INCLUDE_DIR) \ @@ -47,8 +47,8 @@ vpp-measurement-reporter-danos: evel vpp-measurement-reporter-danos.c -ljansson \ -lvyatta-config \ -lcurl - ls -l /build/src/evel/evel-library/libs/x86_64/ + ls -l ${CODE_ROOT}/evel/evel-library/libs/x86_64/ -evel: ${EVEL_CODE_PATH}/evel.c +${LIBS_DIR}/evel.so: ${EVEL_CODE_PATH}/evel.c ${MAKE} -C ${EVEL_BUILD_PATH} all diff --git a/vnfs/VESreporting_vFW5.0_DANOS/debian/control b/vnfs/VESreporting_vFW5.0_DANOS/debian/control index 0b284738..a07c4f2f 100644 --- a/vnfs/VESreporting_vFW5.0_DANOS/debian/control +++ b/vnfs/VESreporting_vFW5.0_DANOS/debian/control @@ -4,9 +4,10 @@ Priority: optional Maintainer: Brian Freeman <bf1936@att.com> Build-depends: debhelper (>= 9), + dh-systemd, dh-exec, libvyatta-cfg-dev, - libcurl4-dev, + libcurl4-openssl-dev | libcurl4-dev, libjansson-dev, Standards-Version: 3.9.8 @@ -14,7 +15,6 @@ Package: vpp-measurement-reporter-danos Architecture: any Depends: ${misc:Depends}, dh-exec, libvyatta-cfg1, ${shlibs:Depends} Pre-Depends: ${misc:Pre-Depends} -Multi-Arch: same Description: ONAP VES Event Library for vFW Closed Loop Demonstration VES reporting library diff --git a/vnfs/VESreporting_vFW5.0_DANOS/debian/vpp-measurement-reporter-danos.install b/vnfs/VESreporting_vFW5.0_DANOS/debian/vpp-measurement-reporter-danos.install index 0d81653e..2dbaab85 100755 --- a/vnfs/VESreporting_vFW5.0_DANOS/debian/vpp-measurement-reporter-danos.install +++ b/vnfs/VESreporting_vFW5.0_DANOS/debian/vpp-measurement-reporter-danos.install @@ -1,5 +1,5 @@ #!/usr/bin/dh-exec -dcae_collector.env run/VES/ +dcae_collector.env etc/VES/ evel/evel-library/libs/x86_64/libevel.so usr/lib/${DEB_HOST_MULTIARCH} onap-ca.crt opt/VES/config vpp-measurement-reporter-danos opt/VES/bin/ diff --git a/vnfs/VESreporting_vFW5.0_DANOS/debian/vpp-measurement-reporter-danos.lintian-overrides b/vnfs/VESreporting_vFW5.0_DANOS/debian/vpp-measurement-reporter-danos.lintian-overrides new file mode 100644 index 00000000..eaa16438 --- /dev/null +++ b/vnfs/VESreporting_vFW5.0_DANOS/debian/vpp-measurement-reporter-danos.lintian-overrides @@ -0,0 +1,2 @@ +vpp-measurement-reporter-danos: init.d-script-not-included-in-package etc/init.d/vpp-measurement-reporter-danos +vpp-measurement-reporter-danos: sharedobject-in-library-directory-missing-soname usr/lib/x86_64-linux-gnu/libevel.so diff --git a/vnfs/VESreporting_vFW5.0_DANOS/debian/vpp-measurement-reporter-danos.service b/vnfs/VESreporting_vFW5.0_DANOS/debian/vpp-measurement-reporter-danos.service index 7d5b0ba4..3c20a800 100644 --- a/vnfs/VESreporting_vFW5.0_DANOS/debian/vpp-measurement-reporter-danos.service +++ b/vnfs/VESreporting_vFW5.0_DANOS/debian/vpp-measurement-reporter-danos.service @@ -2,7 +2,7 @@ Description=ONAP VES Reporting [Service] -EnvironmentFile=/run/VES/dcae_collector.env +EnvironmentFile=/etc/VES/dcae_collector.env ExecStart=/opt/VES/bin/vpp-measurement-reporter-danos $DCAE_COLLECTOR_IP $DCAE_COLLECTOR_PORT $PORT_TO_REPORT Restart=always |