Commit 5c185cad authored by Lluis Gifre Renom's avatar Lluis Gifre Renom
Browse files

Tests - Tools - Mock NCE-FAN / NCE-T Controllers 

- Fixed Dockerfiles
- Fixed SimapUpdater logic
parent 4b1643e4

src/tests/tools/mock_nce_fan_ctrl/Dockerfile

+8 −5
Original line number Diff line number Diff line
@@ -42,15 +42,18 @@ RUN python3 -m pip install --upgrade pip 
RUN python3 -m pip install --upgrade setuptools wheel

RUN python3 -m pip install --upgrade pip-tools



# Create component sub-folders, get specific Python packages

RUN mkdir -p /var/teraflow/nce_fan_ctrl/

WORKDIR /var/teraflow/nce_fan_ctrl/

# Get specific Python packages

RUN mkdir -p /var/teraflow/

WORKDIR /var/teraflow/

COPY src/common/tools/rest_conf/server/requirements.in ./requirements.in

RUN pip-compile --quiet --output-file=requirements.txt requirements.in

RUN python3 -m pip install -r requirements.txt



# Add component files into working directory

COPY src/common/tools/rest_conf/server/restconf_server/ ./nce_fan_ctrl/

# Get component files

RUN mkdir -p /var/teraflow/common/tools/

WORKDIR /var/teraflow/

COPY src/common/tools/rest_api/ ./common/tools/rest_api/

COPY src/common/tools/rest_conf/ ./common/tools/rest_conf/

COPY src/tests/tools/mock_nce_fan_ctrl/nce_fan_ctrl/*.py ./nce_fan_ctrl/

COPY src/tests/tools/mock_nce_fan_ctrl/yang/. ./yang/

COPY src/tests/tools/mock_nce_fan_ctrl/startup.json ./startup.json

src/tests/tools/mock_nce_fan_ctrl/nce_fan_ctrl/SimapUpdater.py

+4 −0
Original line number Diff line number Diff line
@@ -25,6 +25,8 @@ SIMAP_PORT = os.environ.get('SIMAP_PORT' ) 


class SimapUpdater:

    def __init__(self):

        self._simap_client = None



        if SIMAP_ADDRESS is None: return

        if SIMAP_PORT    is None: return
@@ -36,6 +38,8 @@ class SimapUpdater: 




    def upload_topology(self, network_data : Dict) -> None:

        if self._simap_client is None: return



        network_id = network_data['network-id']

        te_topo = self._simap_client.network(network_id)

        te_topo.update()

src/tests/tools/mock_nce_t_ctrl/Dockerfile

+8 −5
Original line number Diff line number Diff line
@@ -42,15 +42,18 @@ RUN python3 -m pip install --upgrade pip 
RUN python3 -m pip install --upgrade setuptools wheel

RUN python3 -m pip install --upgrade pip-tools



# Create component sub-folders, get specific Python packages

RUN mkdir -p /var/teraflow/nce_t_ctrl/

WORKDIR /var/teraflow/nce_t_ctrl/

# Get specific Python packages

RUN mkdir -p /var/teraflow/

WORKDIR /var/teraflow/

COPY src/common/tools/rest_conf/server/requirements.in ./requirements.in

RUN pip-compile --quiet --output-file=requirements.txt requirements.in

RUN python3 -m pip install -r requirements.txt



# Add component files into working directory

COPY src/common/tools/rest_conf/server/restconf_server/ ./nce_t_ctrl/

# Get component files

RUN mkdir -p /var/teraflow/common/tools/

WORKDIR /var/teraflow/

COPY src/common/tools/rest_api/ ./common/tools/rest_api/

COPY src/common/tools/rest_conf/ ./common/tools/rest_conf/

COPY src/tests/tools/mock_nce_t_ctrl/nce_t_ctrl/*.py ./nce_t_ctrl/

COPY src/tests/tools/mock_nce_t_ctrl/yang/. ./yang/

COPY src/tests/tools/mock_nce_t_ctrl/startup.json ./startup.json

src/tests/tools/mock_nce_t_ctrl/nce_t_ctrl/SimapUpdater.py

+4 −0
Original line number Diff line number Diff line
@@ -25,6 +25,8 @@ SIMAP_PORT = os.environ.get('SIMAP_PORT' ) 


class SimapUpdater:

    def __init__(self):

        self._simap_client = None



        if SIMAP_ADDRESS is None: return

        if SIMAP_PORT    is None: return
@@ -36,6 +38,8 @@ class SimapUpdater: 




    def upload_topology(self, network_data : Dict) -> None:

        if self._simap_client is None: return



        network_id = network_data['network-id']

        te_topo = self._simap_client.network(network_id)

        te_topo.update()