Commit 199ceb30 authored by Lluis Gifre Renom's avatar Lluis Gifre Renom
Browse files

Ryu-OpenFlow CI/CD test 

- Added ACK
- Corrected mininet instantiation
parent 97b3c55a

src/tests/ryu-openflow/.gitlab-ci.yml

+3 −3
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ build ryu-openflow: 
  script:

    - docker buildx build -t "$CI_REGISTRY_IMAGE/${TEST_NAME}-ryu:${IMAGE_TAG}" -f ./src/tests/${TEST_NAME}/Ryu.Dockerfile .

    - docker push "$CI_REGISTRY_IMAGE/${TEST_NAME}-ryu:${IMAGE_TAG}"

    - docker buildx build -t "$CI_REGISTRY_IMAGE/${TEST_NAME}-mininet:${IMAGE_TAG}" -f ./src/tests/${TEST_NAME}/Mininet.Dockerfile .

    - docker buildx build -t "$CI_REGISTRY_IMAGE/${TEST_NAME}-mininet:${IMAGE_TAG}" -f ./src/tests/${TEST_NAME}/mininet/Mininet.Dockerfile .

    - docker push "$CI_REGISTRY_IMAGE/${TEST_NAME}-mininet:${IMAGE_TAG}"

    - docker buildx build -t "$CI_REGISTRY_IMAGE/${TEST_NAME}-test:${IMAGE_TAG}" -f ./src/tests/${TEST_NAME}/Test.Dockerfile .

    - docker push "$CI_REGISTRY_IMAGE/${TEST_NAME}-test:${IMAGE_TAG}"
@@ -95,9 +95,9 @@ end2end_test ryu-openflow: 
      done

      echo "Ryu is ready!"

    

    - docker run -d --name mininet --network tfs-test-ryu --ip 172.20.0.11 --privileged --ulimit memlock=-1:-1 --ulimit nofile=65536:65536 --ulimit nproc=65536:65536 "${CI_REGISTRY_IMAGE}/${TEST_NAME}-mininet:${IMAGE_TAG}"

    - docker run -d --name mininet --network tfs-test-ryu --ip 172.20.0.11 --privileged --ulimit memlock=-1:-1 --ulimit nofile=65536:65536 --ulimit nproc=65536:65536 --volume /lib/modules:/lib/modules "${CI_REGISTRY_IMAGE}/${TEST_NAME}-mininet:${IMAGE_TAG}"

   # - docker run -d --name mininet --network tfs-test-ryu --ip 172.20.0.11 "${CI_REGISTRY_IMAGE}/${TEST_NAME}-mininet:${IMAGE_TAG}"

#



    ## Wait for initialization of Device NOSes

    - sleep 10

    - docker ps -a

src/tests/ryu-openflow/Mininet.Dockerfile→src/tests/ryu-openflow/mininet/Mininet.Dockerfile

+2 −0
Original line number Diff line number Diff line
@@ -12,6 +12,8 @@ 
# See the License for the specific language governing permissions and

# limitations under the License.



# Based on: https://github.com/iwaseyusuke/docker-mininet



FROM ubuntu:22.04



USER root

src/tests/ryu-openflow/mininet/README.md

0 → 100644
+3 −0
Original line number Diff line number Diff line 
# Docker-containerized Mininet environment



- Based on: https://github.com/iwaseyusuke/docker-mininet

src/tests/ryu-openflow/mininet/mininet-entrypoint.sh

+15 −0
Original line number Diff line number Diff line 
#!/bin/bash

# Copyright 2022-2025 ETSI SDG TeraFlowSDN (TFS) (https://tfs.etsi.org/)

#

# Licensed under the Apache License, Version 2.0 (the "License");

# you may not use this file except in compliance with the License.

# You may obtain a copy of the License at

#

#      http://www.apache.org/licenses/LICENSE-2.0

#

# Unless required by applicable law or agreed to in writing, software

# distributed under the License is distributed on an "AS IS" BASIS,

# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

# See the License for the specific language governing permissions and

# limitations under the License.



# Based on: https://github.com/iwaseyusuke/docker-mininet



service openvswitch-switch start

ovs-vsctl set-manager ptcp:6640