Commit 3aa1e063 authored by Carlos Natalino's avatar Carlos Natalino
Browse files

Fixing how the client modules are included into the image.'

parent 61ac27f7

src/webui/Config.py

+4 −4
Original line number Diff line number Diff line
@@ -15,10 +15,10 @@ HOST = '0.0.0.0' # accepts connections coming from any ADDRESS 


DEBUG=False



CONTEXT_SERVICE_ADDRESS = '10.107.242.226'

# CONTEXT_SERVICE_ADDRESS = 'context'  # TODO: use the correct context ADDRESS

# CONTEXT_SERVICE_ADDRESS = '10.107.242.226'

CONTEXT_SERVICE_ADDRESS = 'context'  # TODO: use the correct context ADDRESS

CONTEXT_SERVICE_PORT = 1010



DEVICE_SERVICE_ADDRESS = '10.109.49.149'

# DEVICE_SERVICE_ADDRESS = 'device'  # TODO: use the correct address

# DEVICE_SERVICE_ADDRESS = '10.109.49.149'

DEVICE_SERVICE_ADDRESS = 'device'  # TODO: use the correct address

DEVICE_SERVICE_PORT = 2020

src/webui/Dockerfile

+6 −1
Original line number Diff line number Diff line
@@ -29,7 +29,12 @@ RUN python3 -m pip install -r webui/requirements.txt 


# Add files into working directory

COPY common/. common

COPY context/. context

COPY context/__init__.py context/__init__.py

COPY context/proto/. context/proto

COPY context/client/. context/client

COPY device/__init__.py device/__init__.py

COPY device/proto/. device/proto

COPY device/client/. device/client

COPY webui/. webui



# Start webui service

src/webui/service/device/routes.py

+3 −3
Original line number Diff line number Diff line 
from flask import render_template, Blueprint, flash, session, redirect

from context.proto.context_pb2 import ConfigActionEnum, ConfigRule, TopologyIdList, TopologyList

from device.client.DeviceClient import DeviceClient

from context.client.ContextClient import ContextClient

from webui.Config import (CONTEXT_SERVICE_ADDRESS, CONTEXT_SERVICE_PORT,

                DEVICE_SERVICE_ADDRESS, DEVICE_SERVICE_PORT)

from context.client.ContextClient import ContextClient

from webui.proto.context_pb2 import (ContextId, DeviceList, DeviceId,

    Device, DeviceDriverEnum, DeviceOperationalStatusEnum)

    Device, DeviceDriverEnum, DeviceOperationalStatusEnum,

    ConfigActionEnum, ConfigRule, TopologyIdList, TopologyList)

from webui.service.device.forms import AddDeviceForm



device = Blueprint('device', __name__, url_prefix='/device')

src/webui/tests/test_unitary.py

+0 −2
Original line number Diff line number Diff line
@@ -95,6 +95,4 @@ def test_device_add_action(client): 
        'device_endpoints': [],

    }

    rw = client.post('/device/add', data=DEVICE_EMU, follow_redirects=True)

    with open('device_add.html', 'wb') as file:

        file.write(rw.data)

    assert b'success' in rw.data