Integration Testing

.dockerignore

@@ -0,0 +1,27 @@
+# Ignore build artifacts
+target
+# Ignore deployment scripts and configs (unless you need them in the image)
+deploy/
+Dockerfile
+
+.dockerignore
+.git
+.gitignore
+
+
+# Ignore editor/project files
+*.swp
+*.swo
+*.bak
+*.tmp
+*.log
+.DS_Store
+.idea/
+.vscode/
+
+# Ignore test and coverage outputs
+coverage/
+
+# Ignore OS-specific files
+Thumbs.db
+ehthumbs.db

.gitignore

@@ -23,10 +23,10 @@ Session.vim
 .settings/
 .vs/
 
-# Log files
+## Log files
 *.log
 
-# Environment
+## Environment
 *.env
 
 
@@ -48,7 +48,7 @@ build/
 /src/tools/x/target
 Cargo.lock
 
-# Created by default with `src/ci/docker/run.sh`
+## Created by default with `src/ci/docker/run.sh`
 /obj/
 
 
@@ -58,15 +58,19 @@ __pycache__/
 *$py.class
 
 
-# Applications
+## Applications
 *.app
 *.exe
 *.war
 
-# Large media files
+## Large media files
 *.mp4
 *.tiff
 *.avi
 *.flv
 *.mov
 *.wmv
+
+## Ignore the pcaps and certificates generated during integration tests
+tests/integration/capture/*
+tests/integration/cert/*

Cargo.toml

@@ -1,5 +1,5 @@
 [workspace]
-members = ["lightning-cli", "lightning-nf/omnipath/*", "utils/*"]
+members = ["lightning-cli", "lightning-nf/omnipath/app", "tests/integration", "utils/*"]
 resolver = "2"
 
 [workspace.package]

config/amfcfg.yaml

@@ -45,7 +45,7 @@ configuration:
           sd: 112233 # Slice Differentiator (3 bytes hex string, range: 000000~FFFFFF)
   supportDnnList: # the DNN (Data Network Name) list supported by this AMF
     - internet
-  nrfUri: http://103.227.96.139:3000 # a valid URI of NRF
+  nrfUri: http://10.0.0.4:8000 # a valid URI of NRF
   security: # NAS security parameters
     integrityOrder: # the priority of integrity algorithms
       - NIA2

deploy/base/Dockerfile.builder

@@ -0,0 +1,16 @@
+FROM rust:1.88-slim-bookworm 
+
+LABEL maintainer="UnifyAir <support@unifyair.com>"
+
+# Install build dependencies and cargo-chef
+RUN apt-get update && apt-get install -y \
+    pkg-config \
+    libssl-dev \
+    libclang-dev \
+    clang \
+    libsctp-dev
+
+RUN cargo install cargo-chef
+
+# Clean apt cache
+RUN apt-get clean

deploy/base/Dockerfile.executor

@@ -0,0 +1,12 @@
+FROM debian:bookworm-slim AS executor
+
+LABEL maintainer="UnifyAir <support@unifyair.com>"
+
+# Install runtime dependencies
+RUN apt-get update && apt-get install -y \
+    libssl3 \
+    ca-certificates \
+    libsctp1 
+
+# Clean apt cache
+RUN apt-get clean

deploy/gnbsim/Dockerfile

@@ -0,0 +1,41 @@
+# Copyright 2021-present Open Networking Foundation
+# Copyright 2024-present Intel Corporation
+#
+# SPDX-License-Identifier: Apache-2.0
+#
+
+FROM golang:1.24.4-bookworm AS builder
+
+RUN apt-get update && \
+    apt-get -y install --no-install-recommends \
+    vim \
+    ethtool \
+    git && \
+    apt-get clean
+
+WORKDIR $GOPATH/src/gnbsim
+
+ARG VERSION
+
+# Clone the repository instead of copying context files
+RUN git clone https://github.com/omec-project/gnbsim.git . 
+RUN git checkout v$VERSION
+RUN make all
+
+FROM alpine:3.22 AS gnbsim
+
+LABEL maintainer="UnifyAir <support@unifyair.com>"
+
+ARG DEBUG_TOOLS
+
+RUN apk update && apk add --no-cache -U bash tcpdump
+
+# Install debug tools ~ 50MB (if DEBUG_TOOLS is set to true)
+RUN if [ "$DEBUG_TOOLS" = "true" ]; then \
+        apk update && apk add --no-cache -U gcompat vim strace net-tools curl netcat-openbsd bind-tools; \
+        fi
+
+WORKDIR /gnbsim
+
+# Copy executable
+COPY --from=builder /go/src/gnbsim/bin /usr/local/bin/.

deploy/omnipath/Dockerfile

@@ -0,0 +1,36 @@
+# --- Chef base image
+FROM builder-base AS chef
+WORKDIR /unifyair
+
+# --- Planner stage: generate recipe.json for dependencies
+FROM chef AS planner
+COPY . .
+RUN cargo chef prepare --recipe-path recipe.json
+
+# --- Builder stage: build dependencies only (cached if Cargo.toml/Cargo.lock unchanged)
+FROM chef AS builder 
+COPY --from=planner /unifyair/recipe.json recipe.json
+
+# TODO: cleanup https://github.com/LukeMathWalker/cargo-chef/issues/271
+COPY ./rust-toolchain.toml rust-toolchain.toml
+ARG MODE
+RUN if [ "$MODE" = "release" ]; then \
+        cargo chef cook --release --recipe-path recipe.json; \
+    else \
+        cargo chef cook --recipe-path recipe.json; \
+    fi
+# --- Build application
+COPY . .
+ARG MODE
+RUN if [ "$MODE" = "release" ]; then \
+        cargo build --release --package lightning-cli; \
+    else \
+        cargo build --package lightning-cli; \
+    fi
+
+# --- Runtime stage
+FROM executor-base AS executor
+WORKDIR /unifyair
+RUN mkdir -p /unifyair/config
+ARG MODE
+COPY --from=builder /unifyair/target/$MODE/lightning-cli /unifyair/lightning-cli

docker-bake.hcl

@@ -0,0 +1,51 @@
+group "default" {
+  targets = [ "builder-base", "executor-base", "omnipath-debug"]
+}
+
+target "builder-base" {
+  context = "."
+  dockerfile = "deploy/base/Dockerfile.builder"
+  tags = ["unifyair/builder-base:latest"]
+}
+
+target "executor-base" {
+  context = "."
+  dockerfile = "deploy/base/Dockerfile.executor"
+  tags = ["unifyair/executor-base:latest"]
+}
+
+target "omnipath-debug" {
+  contexts = {
+    builder-base = "target:builder-base"
+    executor-base = "target:executor-base"
+  }
+  args = {
+    MODE = "debug"
+  }
+  dockerfile = "deploy/omnipath/Dockerfile"
+  tags = ["unifyair/omnipath-debug:latest"]
+  depends_on = ["builder-base", "executor-base"]
+} 
+
+target "omnipath-release" {
+  contexts = {
+    builder-base = "target:builder-base"
+    executor-base = "target:executor-base"
+  }
+  args = {
+    MODE = "release"
+  }
+  dockerfile = "deploy/omnipath/Dockerfile"
+  tags = ["unifyair/omnipath-release:latest"]
+  depends_on = ["builder-base", "executor-base"]
+} 
+
+target "gnbsim" {
+  dockerfile = "deploy/gnbsim/Dockerfile"
+  args = {
+    VERSION = "1.6.3"
+    DEBUG_TOOLS = "false"
+  }
+  tags = ["unifyair/omecproject-gnbsim:1.6.3"]
+  depends_on = ["builder-base", "executor-base"]
+}

lightning-cli/src/nf_type.rs

@@ -27,6 +27,7 @@ impl App {
 	}
 
 	fn run<T: NfInstance>(config_path: &str) -> color_eyre::Result<()> {
+		install_tracing();
 		let nf_app: NfApp<T> = NfApp::new(config_path)?;
 		let runtime_config = nf_app.config.get_runtime_config();
 		let logging_config = nf_app.config.get_log_config();
@@ -83,7 +84,10 @@ pub enum NfError<T> {
 		#[source]
 		T,
 	),
-	#[error("RuntimeWithDeregistrationError: Runtime error and unable to deregister : \nMain App Error - {0} \nDeregisteration Error {1}")]
+	#[error(
+		"RuntimeWithDeregistrationError: Runtime error and unable to deregister : \nMain App \
+		 Error - {0} \nDeregisteration Error {1}"
+	)]
 	RuntimeWithDeregistrationError(
 		#[backtrace]
 		#[source]
@@ -124,6 +128,7 @@ impl<T: NfInstance> NfApp<T> {
 			};
 			shutdown_token.cancel();
 		});
+		info!("Starting App Initialization");
 		let nf_app = T::initialize(self.config, self.cancellation_token)
 			.map_err(NfError::InitializationFailedError)?;
 		info!("App Initialized Successfully");
@@ -135,7 +140,7 @@ impl<T: NfInstance> NfApp<T> {
 				nf_app.register_nf().await?;
 				info!("Nf Registered Successfully");
 				nf_app.start().await?;
-				info!("Nf Started Successfully");
+				info!("Nf Execution Completed");
 				Ok(())
 			 } => {
 				let dreg_res = nf_app.deregister_nf().await;
@@ -154,8 +159,7 @@ impl<T: NfInstance> NfApp<T> {
 	}
 }
 
-fn setup_logging(config: &LoggingConfig) -> Result<(), AppSetupError> {
-	install_tracing();
+fn setup_logging(_config: &LoggingConfig) -> Result<(), AppSetupError> {
 	Ok(())
 }
 

lightning-nf/omnipath/app/src/builder/sbi/nrf.rs

@@ -24,16 +24,23 @@ impl AppContext {
 			.iter()
 			.map(|e| e.plmn_id.clone())
 			.collect::<Vec<_>>();
-		let nf_profile = NfProfile1Unchecked {
+		let mut nf_profile = NfProfile1Unchecked {
 			nf_instance_id: config.nf_id,
 			nf_type: NfType::Amf,
 			nf_status: NfStatus::Registered,
 			amf_info: Some(amf_info),
 			plmn_list,
-			ipv4_addresses: vec![sbi.register_ipv4.into()],
 			nf_services: config.nf_services.clone(),
 			..Default::default()
 		};
+		match &sbi.register_ip {
+			std::net::IpAddr::V4(v4) => {
+				nf_profile.ipv4_addresses = vec![v4.into()];
+			}
+			std::net::IpAddr::V6(v6) => {
+				nf_profile.ipv6_addresses = vec![v6.into()];
+			}		
+		}
 		trace!("NfProfile 1: {:#?}", nf_profile);
 		Ok(nf_profile.try_into()?)
 	}