Fix pipeline, update genieacs version and cleanup the code

CMakeLists.txt

@@ -17,8 +17,6 @@ ENDIF()
 
 FILE(GLOB ICWMP_SOURCES ${PROJECT_SOURCE_DIR}/src/*.c)
 
-list(REMOVE_ITEM ICWMP_SOURCES ${PROJECT_SOURCE_DIR}/src/datamodel.c)
-
 IF(WITH_WOLFSSL)
 	SET(SSL_LIBS wolfssl)
 	SET(SSL_LIBS crypto)
@@ -37,18 +35,14 @@ IF(WITH_MBEDTLS)
 	add_compile_definitions(LMBEDTLS)
 ENDIF(WITH_MBEDTLS)
 
+#[[Compile and install icwmpd]]
 ADD_EXECUTABLE(icwmpd ${ICWMP_SOURCES})
-
 TARGET_LINK_LIBRARIES(icwmpd pthread z m json-c uci ubox ubus blobmsg_json curl mxml uuid ${SSL_LIBS} ${CRYPTO_LIBS})
-	
 INSTALL(FILES icwmpd DESTINATION usr/sbin)
-
 INSTALL(DIRECTORY DESTINATION etc/icwmpd)
+INSTALL(DIRECTORY DESTINATION var/run/icwmpd)
 
-FILE(GLOB CWMPDM_SOURCES ${PROJECT_SOURCE_DIR}/src/datamodel.c)
-
-ADD_LIBRARY(cwmpdm SHARED ${CWMPDM_SOURCES})
-
+#[[Compile and install libcwmpdm.so]]
+ADD_LIBRARY(cwmpdm SHARED ${PROJECT_SOURCE_DIR}/src/cwmp_dm/datamodel.c)
 INSTALL(DIRECTORY DESTINATION usr/lib/bbfdm)
 INSTALL(TARGETS cwmpdm LIBRARY DESTINATION usr/lib/bbfdm)
-#INSTALL(FILES libcwmpdm.so DESTINATION usr/lib/bbfdm)

gitlab-ci/functional-api-test.sh

@@ -7,7 +7,6 @@ pwd
 trap cleanup EXIT
 trap cleanup SIGINT
 
-date +%s > timestamp.log
 echo "Compiling icmwp"
 build_icwmp
 
@@ -43,4 +42,6 @@ exec_cmd tap-junit --input ./api-test-result.log --output report
 
 check_valgrind_xml
 
+date +%s > timestamp.log
+
 echo "Functional API test :: PASS"

gitlab-ci/functional-test.sh

@@ -8,7 +8,6 @@ pwd
 trap cleanup EXIT
 trap cleanup SIGINT
 
-date +%s > timestamp.log
 echo "Compiling icmwp"
 build_icwmp
 
@@ -95,4 +94,6 @@ exec_cmd tap-junit --input ./funl-test-result.log --output report
 sleep 10
 check_valgrind_xml
 
+date +%s > timestamp.log
+
 echo "Functional test :: PASS"

gitlab-ci/install-dependencies.sh

@@ -9,8 +9,9 @@ pwd
 exec_cmd apt update
 exec_cmd apt install -y mongodb jq uuid-dev
 exec_cmd apt-get install -y libmxml-dev
+
 # install genieacs
-exec_cmd npm install -g genieacs@1.2.5
+exec_cmd npm install -g genieacs@1.2.9
 ln -sf /root/.nvm/versions/node/v14.16.1/bin/genieacs-cwmp /usr/sbin/genieacs-cwmp
 ln -sf /root/.nvm/versions/node/v14.16.1/bin/genieacs-fs /usr/sbin/genieacs-fs  
 ln -sf /root/.nvm/versions/node/v14.16.1/bin/genieacs-ui /usr/sbin/genieacs-ui

gitlab-ci/setup.sh

@@ -8,7 +8,6 @@ fi
 echo "preparation script"
 pwd
 
-mkdir -p /var/run/icwmpd/
 rm -rf /etc/supervisor/conf.d/*.conf
 cp ./gitlab-ci/iopsys-supervisord.conf /etc/supervisor/conf.d/
 cp -rf ./test/files/* /

gitlab-ci/shared.sh

@@ -38,8 +38,6 @@ function exec_cmd()
 
 function configure_genieacs()
 {
-	start_acs
-	sleep 10
 	echo "create a new user"
 	curl -X POST 'http://localhost:3000/init' -H "Content-Type: application/json" --data '{"users": true, "presets": true, "filters": true, "device": true, "index": true, "overview": true}' >/dev/null 2>&1
 	check_ret $?
@@ -127,8 +125,9 @@ function build_icwmp()
 	cmake ../ -DCMAKE_C_FLAGS="$COV_CFLAGS " -DCMAKE_EXE_LINKER_FLAGS="$COV_LDFLAGS" -DWITH_OPENSSL=ON -DCMAKE_INSTALL_PREFIX=/
 	exec_cmd make
 
-	echo "installing icwmpd binary"
+	echo "installing icwmpd binary and libcwmpdm.so library"
 	exec_cmd cp icwmpd ../
+	exec_cmd cp libcwmpdm.so ../
 	exec_cmd make install
 	cd ..
 }

gitlab-ci/unit-test.sh

@@ -15,6 +15,9 @@ configure_download_firmware
 rm /etc/supervisor/conf.d/*.conf
 cp ./gitlab-ci/iopsys-supervisord-unit.conf /etc/supervisor/conf.d/
 
+echo "Compiling icmwp"
+build_icwmp
+
 echo "Starting dependent services"
 supervisorctl status all
 supervisorctl update
@@ -26,13 +29,6 @@ supervisorctl status all
 echo "Clean cmocka"
 make clean -C test/cmocka/
 
-echo "icwmp datamodel install"
-make -C test/cmocka libcwmpdm
-mkdir -p /usr/lib/bbfdm
-cp test/cmocka/libcwmpdm.so /usr/lib/bbfdm
-supervisorctl stop uspd 
-supervisorctl start uspd
-
 echo "Running unit test"
 make -C test/cmocka all
 check_ret $?

test/cmocka/Makefile

@@ -8,9 +8,7 @@ UNIT_TESTS:= icwmp_unit_testd
 
 VALGRIND = /usr/bin/valgrind --xml=yes --xml-file=memory-report.xml --leak-check=full --show-reachable=yes --show-leak-kinds=all --errors-for-leak-kinds=all
 
-OBJS_SOURCES := $(filter-out ../../src/datamodel.c,$(wildcard ../../src/*.c))
-ICWMP_OBJS=$(patsubst ../../src/%.c, %.o, $(OBJS_SOURCES))
-ICWMP_OBJS := $(filter-out datamodel.o, $(ICWMP_OBJS))
+ICWMP_OBJS=$(patsubst ../../src/%.c, %.o, $(wildcard ../../src/*.c))
 TEST_SRCS =  $(wildcard *.c)
 TEST_OBJS = $(TEST_SRCS:=.o)
 
@@ -22,13 +20,10 @@ TEST_OBJS = $(TEST_SRCS:=.o)
 
 libunit: ${ICWMP_OBJS}
 	$(CC) ${LIB_CFLAGS} -shared -o libicwmp.so ${ICWMP_OBJS} ${LIB_LDFLAGS}
-	
-libcwmpdm: datamodel.o
-	$(CC) ${LIB_CFLAGS} -shared -o libcwmpdm.so datamodel.o ${LIB_LDFLAGS} -lbbfdm
-	
+
 icwmp_unit_testd:
 	make ${TEST_OBJS}
-	$(CC) -o $@ ${TEST_OBJS} ${LIB_LDFLAGS} -lcmocka -L. -licwmp -lcwmpdm -Wl,-rpath=.
+	$(CC) -o $@ ${TEST_OBJS} ${LIB_LDFLAGS} -lcmocka -L. -licwmp -Wl,-rpath=.
 	
 all: libunit ${UNIT_TESTS}
 	$(VALGRIND) ./${UNIT_TESTS}
@@ -36,6 +31,6 @@ all: libunit ${UNIT_TESTS}
 	echo "All test done"
 
 clean:
-	rm -fv *.o libicwmp.so libcwmpdm.so ${UNIT_TESTS}
+	rm -fv *.o libicwmp.so ${UNIT_TESTS}
 
 .PHONY: clean unit-test