aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPiotr Darosz <piotr.darosz@nokia.com>2019-07-22 07:38:00 +0200
committerGary Wu <gary.wu@futurewei.com>2019-07-22 20:30:19 +0000
commitbbf79d7cd7a2a0abd6cbed029ee90fc9d119f3ef (patch)
tree089528aae92acb137baf9caa63c635e22d14c3f8
parentb7f08110865e5e79cf018a6ab9d80f3e7dec20af (diff)
Get rid of binary files in pnfsimulator repo
Remove usage of binary files in pnfsimulator vcs Issue-ID: INT-1134 Signed-off-by: Piotr Darosz <piotr.darosz@nokia.com> Change-Id: I23b8f01a099b7e80542d258b2e0bcd34742d3684
-rwxr-xr-xtest/mocks/pnfsimulator/netconfsimulator/netconf/initialize_netopeer.sh7
-rwxr-xr-x[-rw-r--r--]test/mocks/pnfsimulator/netconfsimulator/netopeer-change-saver-native/CMakeLists.txt4
-rwxr-xr-xtest/mocks/pnfsimulator/netconfsimulator/netopeer-change-saver-native/libsysrepo-cpp.sobin442112 -> 0 bytes
3 files changed, 8 insertions, 3 deletions
diff --git a/test/mocks/pnfsimulator/netconfsimulator/netconf/initialize_netopeer.sh b/test/mocks/pnfsimulator/netconfsimulator/netconf/initialize_netopeer.sh
index 71c1f215b..550a64ff4 100755
--- a/test/mocks/pnfsimulator/netconfsimulator/netconf/initialize_netopeer.sh
+++ b/test/mocks/pnfsimulator/netconfsimulator/netconf/initialize_netopeer.sh
@@ -47,8 +47,13 @@ apt-get install -y python3 python3-pip librdkafka-dev
pip3 install flask flask_restful
nohup python3 /netconf/yang_loader_server.py &
+cd /opt/dev/sysrepo && cmake .
+cd /opt/dev/sysrepo && make -j2
+
/bin/cp -R /$NETOPEER_CHANGE_SAVER /opt/dev/
-ln -s /opt/dev/sysrepo/build/src/libsysrepo.so /$NETOPEER_CHANGE_SAVER/libsysrepo.so
+cp /opt/dev/sysrepo/swig/libSysrepo-cpp.so /opt/dev/$NETOPEER_CHANGE_SAVER/
+ln -s /opt/dev/sysrepo/build/src/libsysrepo.so /opt/dev/$NETOPEER_CHANGE_SAVER/libsysrepo.so
+
cd /opt/dev/$NETOPEER_CHANGE_SAVER && cmake .
cd /opt/dev/$NETOPEER_CHANGE_SAVER && make
/opt/dev/$NETOPEER_CHANGE_SAVER/bin/netopeer-change-saver pnf-simulator kafka1 config
diff --git a/test/mocks/pnfsimulator/netconfsimulator/netopeer-change-saver-native/CMakeLists.txt b/test/mocks/pnfsimulator/netconfsimulator/netopeer-change-saver-native/CMakeLists.txt
index 35a3a85ad..f21576d00 100644..100755
--- a/test/mocks/pnfsimulator/netconfsimulator/netopeer-change-saver-native/CMakeLists.txt
+++ b/test/mocks/pnfsimulator/netconfsimulator/netopeer-change-saver-native/CMakeLists.txt
@@ -11,10 +11,10 @@ find_package(Threads REQUIRED)
add_executable(netopeer-change-saver main.cpp sysrepo.h Application.cpp Application.h KafkaWrapper.cpp KafkaWrapper.h
SysrepoCallback.cpp SysrepoCallback.h)
-file(COPY ${CMAKE_CURRENT_SOURCE_DIR}/libsysrepo-cpp.so
+file(COPY ${CMAKE_CURRENT_SOURCE_DIR}/libSysrepo-cpp.so
DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/bin)
-target_link_libraries(netopeer-change-saver libsysrepo-cpp.so)
+target_link_libraries(netopeer-change-saver libSysrepo-cpp.so)
target_link_libraries(netopeer-change-saver libsysrepo.so)
target_link_libraries(netopeer-change-saver Threads::Threads)
target_link_libraries(netopeer-change-saver librdkafka.so) \ No newline at end of file
diff --git a/test/mocks/pnfsimulator/netconfsimulator/netopeer-change-saver-native/libsysrepo-cpp.so b/test/mocks/pnfsimulator/netconfsimulator/netopeer-change-saver-native/libsysrepo-cpp.so
deleted file mode 100755
index efdcc135d..000000000
--- a/test/mocks/pnfsimulator/netconfsimulator/netopeer-change-saver-native/libsysrepo-cpp.so
+++ /dev/null
Binary files differ