Commit d9d70cb1 authored by Andrea Sgambelluri's avatar Andrea Sgambelluri
Browse files

Merge branch 'develop' of https://labs.etsi.org/rep/tfs/controller into cnit_ofc26

parents 81b25ce0 51616c0f

deploy/tfs.sh

+1 −1
Original line number Diff line number Diff line
@@ -133,7 +133,7 @@ kubectl create secret generic crdb-data --namespace ${TFS_K8S_NAMESPACE} --type= 
printf "\n"



echo ">>> Create Secret with Apache Kafka..."

KFK_SERVER_PORT=$(kubectl --namespace ${KFK_NAMESPACE} get service kafka-public -o 'jsonpath={.spec.ports[0].port}')

KFK_SERVER_PORT=$(kubectl --namespace ${KFK_NAMESPACE} get service kafka-service -o 'jsonpath={.spec.ports[0].port}')

kubectl create secret generic kfk-kpi-data --namespace ${TFS_K8S_NAMESPACE} --type='Opaque' \

    --from-literal=KFK_NAMESPACE=${KFK_NAMESPACE} \

    --from-literal=KFK_SERVER_PORT=${KFK_SERVER_PORT}

manifests/kafka/single-node.yaml

+3 −3
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ 
apiVersion: v1

kind: Service

metadata:

  name: kafka-public

  name: kafka-service

  labels:

    app.kubernetes.io/component: message-broker

    app.kubernetes.io/instance: kafka
@@ -50,7 +50,7 @@ spec: 
      app.kubernetes.io/component: message-broker

      app.kubernetes.io/instance: kafka

      app.kubernetes.io/name: kafka

  serviceName: "kafka-public"

  serviceName: "kafka-service"

  replicas: 1

  minReadySeconds: 5

  template:
@@ -83,7 +83,7 @@ spec: 
          - name: KAFKA_CFG_LISTENER_SECURITY_PROTOCOL_MAP

            value: "PLAINTEXT:PLAINTEXT,CONTROLLER:PLAINTEXT,EXTERNAL:PLAINTEXT"

          - name: KAFKA_CFG_ADVERTISED_LISTENERS

            value: "PLAINTEXT://kafka-public.kafka.svc.cluster.local:9092,EXTERNAL://localhost:9094"

            value: "PLAINTEXT://kafka-service.kafka.svc.cluster.local:9092,EXTERNAL://localhost:9094"

          - name: KAFKA_CFG_CONTROLLER_LISTENER_NAMES

            value: "CONTROLLER"

          - name: KAFKA_CFG_CONTROLLER_QUORUM_VOTERS

proto/context.proto

+1 −0
Original line number Diff line number Diff line
@@ -359,6 +359,7 @@ enum ServiceTypeEnum { 
  SERVICETYPE_IP_LINK = 11;

  SERVICETYPE_TAPI_LSP = 12;

  SERVICETYPE_IPOWDM = 13;

  SERVICETYPE_UPF = 14;

}



enum ServiceStatusEnum {

src/common/DeviceTypes.py

+3 −0
Original line number Diff line number Diff line
@@ -38,6 +38,9 @@ class DeviceTypeEnum(Enum): 
    EMULATED_PACKET_ROUTER          = 'emu-packet-router'

    EMULATED_PACKET_SWITCH          = 'emu-packet-switch'

    EMULATED_XR_CONSTELLATION       = 'emu-xr-constellation'

    EMULATED_ORAN_DU                = 'oran-du'

    EMULATED_ORAN_CU                = 'oran-cu'

    EMULATED_ORAN_CN                = 'oran-cn'



    # Real device types

    CLIENT                          = 'client'

src/common/tools/context_queries/Slice.py

+1 −1
Original line number Diff line number Diff line
@@ -144,7 +144,7 @@ def get_slice_by_defualt_id( 
        include_subslice_ids=include_subslice_ids, include_config_rules=include_config_rules)





def get_slice_by_defualt_name(

def get_slice_by_default_name(

    context_client : ContextClient, slice_name : str, context_uuid : str = DEFAULT_CONTEXT_NAME,

    rw_copy : bool = False, include_endpoint_ids : bool = True, include_constraints : bool = True,

    include_service_ids : bool = True, include_subslice_ids : bool = True, include_config_rules : bool = True