Merge pull request #98 from atlanticwave-sdx/luisdev

SDX integration progress tracking #94

README.md

@@ -159,6 +159,7 @@ SDX_CONTROLLER_DB_PASS='sdx_controller_pwd'
 SDX_CONTROLLER_DB='sdx_controller'
 SDX_VERSION='1.0.0'
 SDX_CONTROLLER_MQ_HOST='192.168.0.12'
+SDX_CONTROLLER_MQ_PORT='5672'
 SDX_CONTROLLER_SUB_QUEUE='topo'
 SDX_CONTROLLER_SUB_TOPIC='sdx_q1'
 SDX_CONTROLLER_SUB_EXCHANGE=''
@@ -185,6 +186,7 @@ SDX_LC_PUB_QUEUE='sdx_q1'
 SDX_LC_SUB_QUEUE='connection'
 SDX_LC_SUB_EXCHANGE='connection'
 SDX_LC_SUB_TOPIC='lc1_q1'
+SLEEP_TIME='5'
 RABBITMQ_DEFAULT_HOST='rabbitmq3'
 RABBITMQ_DEFAULT_USER='mq_user'
 RABBITMQ_DEFAULT_PASS='mq_pwd'

data-plane/1_build_kytos.sh

@@ -5,4 +5,5 @@ docker build --no-cache -f os_base/mongo_base/Dockerfile -t sdx-mongo .
 docker build --no-cache -f os_base/python_base/Dockerfile -t python-base .
 docker build --no-cache -f os_base/flask_base/Dockerfile -t flask-base .
 docker build --no-cache -f os_base/rabbit_base/Dockerfile -t sdx-rabbit .
+docker build --no-cache -f os_base/controller_base/Dockerfile -t controller-base .
 docker build --no-cache -f container-validator/Dockerfile -t validator .

data-plane/3_build_local_controllers.sh

@@ -1,5 +1,5 @@
 #!/bin/sh
-docker build --no-cache -f Dockerfile -t amlight-sdx-lc .
-docker build --no-cache -f Dockerfile -t sax-sdx-lc .
-docker build --no-cache -f Dockerfile -t tenet-sdx-lc .
-docker build --no-cache -f ./container-sdx-controller/Dockerfile -t sdx-controller .
+docker build --no-cache -f ./Docker-files/sdx-lc/Dockerfile -t amlight-sdx-lc .
+docker build --no-cache -f ./Docker-files/sdx-lc/Dockerfile -t sax-sdx-lc .
+docker build --no-cache -f ./Docker-files/sdx-lc/Dockerfile -t tenet-sdx-lc .
+docker build --no-cache -f ./Docker-files/sdx-controller/Dockerfile -t sdx-controller .

data-plane/Docker-files/sdx-controller/Dockerfile

@@ -0,0 +1,7 @@
+FROM controller-base
+
+WORKDIR /usr/src/app
+COPY ./container-sdx-controller /usr/src/app
+
+# ENTRYPOINT ["python3"]
+# CMD ["-m", "uvicorn", "sdx_controller.app:asgi_app", "--host", "0.0.0.0", "--port", "8080"]

data-plane/docker-compose.yml

@@ -18,7 +18,6 @@ services:
       - ./tests:/tests
       - ./scripts:/scripts
       - ./etc/kytos:/etc/kytos
-      - ./container-sdx-lc/logs/amlight:/var/log/amlight
     env_file: 
       - .env
     environment:
@@ -523,11 +522,12 @@ services:
       MONGO_INITDB_ROOT_PASSWORD: ${ROOT_DB_PASS}
       SDX_VERSION: ${SDX_VERSION}
       MQ_HOST: ${SDX_CONTROLLER_MQ_HOST}
-      MQ_SRVC: ${RABBITMQ_DEFAULT_HOST}
+      MQ_PORT: ${SDX_CONTROLLER_MQ_PORT}
       MQ_USER: ${RABBITMQ_DEFAULT_USER}
       MQ_PASS: ${RABBITMQ_DEFAULT_PASS}
       SUB_TOPIC: ${SDX_CONTROLLER_SUB_TOPIC}
       SUB_QUEUE: ${SDX_CONTROLLER_SUB_QUEUE}
+      SLEEP_TIME: ${SLEEP_TIME}
       DB_NAME: ${SDX_LC_DB_NAME}
       DB_CONFIG_TABLE_NAME: 'sdx-controller'
     entrypoint: ["python3", "-m", "swagger_server"]

data-plane/os_base/controller_base/Dockerfile

@@ -0,0 +1,11 @@
+FROM python:3.9-slim-bullseye
+
+RUN apt-get update \
+    && apt-get -y upgrade \
+    && apt-get install -y --no-install-recommends gcc python3-dev git \
+    && apt-get clean \
+    && rm -rf /var/lib/apt/lists/* \
+    && mkdir -p /usr/src/app
+
+COPY os_base/controller_base/requirements.txt requirements.txt
+RUN pip3 install -r requirements.txt

data-plane/os_base/controller_base/requirements.txt

@@ -0,0 +1,50 @@
+aiohttp==3.8.6
+apispec==5.1.1
+asgiref==3.7.2
+attrs==23.1.0; python_version >= '3.7'
+certifi==2023.7.22; python_version >= '3.6'
+charset-normalizer==2.0.12; python_version >= '3'
+click==8.1.3
+clickclick==20.10.2
+connexion==2.14.1
+dictpath==0.1.3
+dnspython==1.16.0
+eventlet==0.30.2
+flask==2.1.2
+greenlet==1.1.2
+gunicorn==20.1.0
+idna==3.2
+importlib-metadata==6.8.0; python_version < '3.10'
+inflection==0.5.1; python_version >= '3.5'
+iniconfig==1.1.1
+isodate==0.6.1
+itsdangerous==2.1.2; python_version >= '3.7'
+jinja2==3.1.2
+jsonschema==4.0.1
+lazy-object-proxy==1.9.0; python_version >= '3.7'
+markupsafe==2.1.3; python_version >= '3.7'
+more-itertools==10.0.0; python_version >= '3.8'
+openapi-core==0.14.2
+openapi-schema-validator==0.1.5
+openapi-spec-validator==0.3.1
+packaging==21.3
+parse==1.19.1
+pika==1.3.2
+pluggy==1.0.0
+py==1.11.0
+pymongo==4.3.3
+pyparsing==3.0.6
+pyrsistent==0.19.3; python_version >= '3.7'
+python_dateutil >= 2.8
+python-dotenv==1.0.0
+pytz==2023.3
+pyyaml==5.4.1
+requests==2.26.0
+setuptools==41.6.0
+six==1.16.0
+swagger-ui-bundle==0.0.9
+urllib3==1.26.16
+uvicorn==0.27.1
+werkzeug==2.2.3
+zipp==3.16.2; python_version >= '3.8'
+sdx-pce @ git+https://github.com/atlanticwave-sdx/[email protected]

data-plane/os_base/kytos_base/Dockerfile

@@ -1,4 +1,4 @@
-FROM amlight/kytos:latest
+FROM amlight/kytos:2023.1
 
 # LABEL about the custom image
 LABEL maintainer="[email protected]"
@@ -66,8 +66,9 @@ RUN apt install python3-pip --assume-yes
 RUN apt-get purge --assume-yes --auto-remove -o APT::AutoRemove::RecommendsImportant=false && \
 rm -rf /var/lib/apt/lists/*
 
+RUN pip3 install pipenv
+
 COPY ./os_base/kytos_base/requirements.txt requirements.txt
 RUN pip3 install --no-cache-dir -r requirements.txt
 
 COPY ./os_base/kytos_base/Pipfile Pipfile
-RUN pip3 install pipenv