Commit db37ba7e authored by Lluis Gifre Renom's avatar Lluis Gifre Renom
Browse files

Merge branch 'develop' of https://gitlab.com/teraflow-h2020/controller into... 

Merge branch 'develop' of https://gitlab.com/teraflow-h2020/controller into feat/ecoc22-dc-interconnect-disjoint
parents 06898aae 2a093fe6

manifests/pathcompservice.yaml

+12 −12
Original line number Diff line number Diff line
@@ -51,18 +51,18 @@ spec: 
      - name: backend

        image: registry.gitlab.com/teraflow-h2020/controller/pathcomp-backend:latest

        imagePullPolicy: Always

        readinessProbe:

          httpGet:

            path: /health

            port: 8081

          initialDelaySeconds: 5

          timeoutSeconds: 5

        livenessProbe:

          httpGet:

            path: /health

            port: 8081

          initialDelaySeconds: 5

          timeoutSeconds: 5

        #readinessProbe:

        #  httpGet:

        #    path: /health

        #    port: 8081

        #  initialDelaySeconds: 5

        #  timeoutSeconds: 5

        #livenessProbe:

        #  httpGet:

        #    path: /health

        #    port: 8081

        #  initialDelaySeconds: 5

        #  timeoutSeconds: 5

        resources:

          requests:

            cpu: 250m

scripts/show_logs_pathcomp_backend.sh

0 → 100755
+27 −0
Original line number Diff line number Diff line 
#!/bin/bash

# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)

#

# 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.



########################################################################################################################

# Define your deployment settings here

########################################################################################################################



# If not already set, set the name of the Kubernetes namespace to deploy to.

export TFS_K8S_NAMESPACE=${TFS_K8S_NAMESPACE:-"tfs"}



########################################################################################################################

# Automated steps start here

########################################################################################################################



kubectl --namespace $TFS_K8S_NAMESPACE logs deployment/pathcompservice -c backend

scripts/show_logs_pathcomp_frontend.sh

0 → 100755
+27 −0
Original line number Diff line number Diff line 
#!/bin/bash

# Copyright 2021-2023 H2020 TeraFlow (https://www.teraflow-h2020.eu/)

#

# 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.



########################################################################################################################

# Define your deployment settings here

########################################################################################################################



# If not already set, set the name of the Kubernetes namespace to deploy to.

export TFS_K8S_NAMESPACE=${TFS_K8S_NAMESPACE:-"tfs"}



########################################################################################################################

# Automated steps start here

########################################################################################################################



kubectl --namespace $TFS_K8S_NAMESPACE logs deployment/pathcompservice -c frontend

src/common/DeviceTypes.py

+11 −11
Original line number Diff line number Diff line
@@ -16,13 +16,13 @@ from enum import Enum 


class DeviceTypeEnum(Enum):

    EMULATED_DATACENTER       = 'emu-datacenter'

    EMULATED_OPTICAL_LINE_SYSTEM = 'emu-optical-line-system'

    EMULATED_OPEN_LINE_SYSTEM = 'emu-open-line-system'

    EMULATED_PACKET_ROUTER    = 'emu-packet-router'

    DATACENTER                = 'datacenter'

    MICROVAWE_RADIO_SYSTEM    = 'microwave-radio-system'

    OPTICAL_ROADM             = 'optical-roadm'

    OPTICAL_TRANDPONDER       = 'optical-trandponder'

    OPTICAL_LINE_SYSTEM          = 'optical-line-system'

    OPEN_LINE_SYSTEM          = 'open-line-system'

    PACKET_ROUTER             = 'packet-router'

    PACKET_SWITCH             = 'packet-switch'

    P4_SWITCH                 = 'p4-switch'

src/common/tools/object_factory/Constraint.py

+14 −1
Original line number Diff line number Diff line
@@ -15,6 +15,19 @@ 
import json

from typing import Any, Dict, Union



def json_constraint(constraint_type : str, constraint_value : Union[str, Dict[str, Any]]):

def json_constraint_custom(constraint_type : str, constraint_value : Union[str, Dict[str, Any]]) -> Dict:

    if not isinstance(constraint_value, str): constraint_value = json.dumps(constraint_value, sort_keys=True)

    return {'custom': {'constraint_type': constraint_type, 'constraint_value': constraint_value}}



def json_constraint_endpoint_location_region(endpoint_id : Dict, region : str) -> Dict:

    return {'endpoint_location': {'endpoint_id': endpoint_id, 'location': {'region': region}}}



def json_constraint_endpoint_location_gps(endpoint_id : Dict, latitude : float, longitude : float) -> Dict:

    gps_position = {'latitude': latitude, 'longitude': longitude}

    return {'endpoint_location': {'endpoint_id': endpoint_id, 'location': {'gps_position': gps_position}}}



def json_constraint_endpoint_priority(endpoint_id : Dict, priority : int) -> Dict:

    return {'endpoint_priority': {'endpoint_id': endpoint_id, 'priority': priority}}



def json_constraint_sla_availability(num_disjoint_paths : int, all_active : bool) -> Dict:

    return {'sla_availability': {'num_disjoint_paths': num_disjoint_paths, 'all_active': all_active}}