Merge pull request #17 from frederic-loui/external-holo-cli

External holo cli
holo-routing · Apr 9, 2024 · ed85b84 · ed85b84
2 parents 54bf1ed + 8d360eb
commit ed85b84
Show file tree

Hide file tree

Showing 17 changed files with 12 additions and 2,238 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -2,7 +2,6 @@
 members = [
   "holo-bfd",
   "holo-bgp",
-  "holo-cli",
   "holo-daemon",
   "holo-interface",
   "holo-keychain",
@@ -17,7 +16,7 @@ members = [
   "holo-utils",
   "holo-yang",
 ]
-default-members = ["holo-daemon", "holo-cli"]
+default-members = ["holo-daemon"]
 resolver = "2"
 
 [workspace.package]

diff --git a/docker/Dockerfile b/docker/Dockerfile
@@ -9,10 +9,20 @@ RUN apt-get update && \
     libpcre2-dev \
     protobuf-compiler
 
+# holo
+# ==============================================================================
+
 WORKDIR /usr/src/holo
 COPY . .
 RUN cargo build --release
 
+# holo-cli (order is important as holo-cli is using protobuf file in holo)
+# ==============================================================================
+
+RUN git clone https://github.com/holo-routing/holo-cli.git /usr/src/holo-cli
+WORKDIR /usr/src/holo-cli
+RUN cargo build --release
+
 # Final base
 # ==============================================================================
 
@@ -35,7 +45,7 @@ RUN echo "alias ipr='ip -4 ro ; ip -6 ro ; ip -M ro'" >> /root/.bashrc
 
 COPY --from=build /usr/src/holo/holo-daemon/holod.toml /etc/holod.toml
 COPY --from=build /usr/src/holo/target/release/holod /usr/local/sbin/
-COPY --from=build /usr/src/holo/target/release/holo-cli /usr/local/sbin/
+COPY --from=build /usr/src/holo-cli/target/release/holo-cli /usr/local/sbin/
 
 ENV RUST_BACKTRACE=1
 ENV RUST_LOG=holo=debug

diff --git a/holo-cli/Cargo.toml b/holo-cli/Cargo.toml
diff --git a/holo-cli/LICENSE b/holo-cli/LICENSE
diff --git a/holo-cli/build.rs b/holo-cli/build.rs
diff --git a/holo-cli/src/client/grpc.rs b/holo-cli/src/client/grpc.rs
diff --git a/holo-cli/src/client/mod.rs b/holo-cli/src/client/mod.rs