Merge pull request #7 from CloudlyIO/feature/mpclient-demo-cli-build

add mpclient demo cli to docker container
lf-connectivity · Mar 11, 2024 · 9856974 · 9856974
2 parents 80f860d + f7fa350
commit 9856974
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 5 deletions.
diff --git a/mplane_client/CMakeLists.txt b/mplane_client/CMakeLists.txt
@@ -7,7 +7,7 @@ project (MPLANE_CLIENT CXX)
 
 set (MPC_CLIENT mpc_client)
 set (MPC_TESTER mpc_tester)
-# set (Target_mpclient_demo mpclient-demo)
+set (Target_mpclient_demo mpclient-demo)
 
 find_program (PROTOC protoc PATHS deps/install/bin)
 find_program (GRPC_CPP_PLUGIN grpc_cpp_plugin PATHS deps/install/bin)
@@ -59,9 +59,14 @@ file (GLOB_RECURSE MPC_TESTER_SRC test/*.cpp)
 add_executable (${MPC_TESTER} ${MPC_TESTER_SRC} ${MPC_IF_SRC})
 target_link_libraries (${MPC_TESTER} ${MPC_LIBS})
 
-# file (GLOB MPCLIENT_DEMO_SOURCES src/demo/*.cpp)
-# add_executable (${Target_mpclient_demo} ${MPCLIENT_DEMO_SOURCES} ${MPC_IF_SRC})
-# target_link_libraries (${Target_mpclient_demo} ${Target_mpclient_client} ${MPC_LIBS})
+file (GLOB MPCLIENT_DEMO_SOURCES example/*.cpp)
+add_executable (${Target_mpclient_demo} ${MPCLIENT_DEMO_SOURCES} ${MPC_IF_SRC})
+
+file (GLOB RPC_CLIENT_SOURCES test/rpc-client/*.cpp)
+target_sources (${Target_mpclient_demo} PRIVATE ${RPC_CLIENT_SOURCES})
+
+target_link_libraries (${Target_mpclient_demo} ${MPC_LIBS})
+
 
 # Copy test cases files when they are modified
 file (GLOB MPC_TESTS_CASES test/tests/cases/*)

diff --git a/mplane_client/example/README.md b/mplane_client/example/README.md
@@ -13,7 +13,7 @@ and executes the corresponding mpclient RPC.
 ## Usage
 ```
 ./wrapper.sh ./mpclient-demo \
-  --commands demo/cases/connect.json \
+  --commands ../example/cases/connect.json \
   --netconfHost 192.168.10.13 \
   --netconfUser oran \
   --netconfPassword Password123 \

diff --git a/mplane_client/test/docker/test.integrated.Dockerfile b/mplane_client/test/docker/test.integrated.Dockerfile
@@ -18,6 +18,7 @@ RUN patch --directory /opt/dev/ntsim-ng/config/ --strip 4 config.json config.pat
 COPY src /mplane_client/src
 COPY test/rpc-client /mplane_client/test/rpc-client
 COPY test/tests /mplane_client/test/tests
+COPY example /mplane_client/example
 
 WORKDIR /mplane_client/utils
 RUN ./build_mpclient.sh --parallel 2