Commit 6d62d7f4 authored by Lluis Gifre Renom's avatar Lluis Gifre Renom
Browse files

Merge branch 'feat/service-handler-microwave' into 'develop' 

Microwave ServiceHandler

See merge request !22
parents 7150a413 9e3381e8

manifests/deviceservice.yaml

+1 −1
Original line number Diff line number Diff line
@@ -34,7 +34,7 @@ spec: 
        - containerPort: 2020

        env:

        - name: LOG_LEVEL

          value: "DEBUG"

          value: "INFO"

        readinessProbe:

          exec:

            command: ["/bin/grpc_health_probe", "-addr=:2020"]

manifests/serviceservice.yaml

+1 −1
Original line number Diff line number Diff line
@@ -34,7 +34,7 @@ spec: 
        - containerPort: 3030

        env:

        - name: LOG_LEVEL

          value: "DEBUG"

          value: "INFO"

        readinessProbe:

          exec:

            command: ["/bin/grpc_health_probe", "-addr=:3030"]

manifests/sliceservice.yaml

+1 −1
Original line number Diff line number Diff line
@@ -34,7 +34,7 @@ spec: 
        - containerPort: 4040

        env:

        - name: LOG_LEVEL

          value: "DEBUG"

          value: "INFO"

        readinessProbe:

          exec:

            command: ["/bin/grpc_health_probe", "-addr=:4040"]

src/common/DeviceTypes.py

+2 −2
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ class DeviceTypeEnum(Enum): 


    # Emulated device types

    EMULATED_DATACENTER             = 'emu-datacenter'

    EMULATED_MICROVAWE_RADIO_SYSTEM = 'emu-microwave-radio-system'

    EMULATED_MICROWAVE_RADIO_SYSTEM = 'emu-microwave-radio-system'

    EMULATED_OPEN_LINE_SYSTEM       = 'emu-open-line-system'

    EMULATED_OPTICAL_ROADM          = 'emu-optical-roadm'

    EMULATED_OPTICAL_TRANSPONDER    = 'emu-optical-transponder'
@@ -28,7 +28,7 @@ class DeviceTypeEnum(Enum): 


    # Real device types

    DATACENTER                      = 'datacenter'

    MICROVAWE_RADIO_SYSTEM          = 'microwave-radio-system'

    MICROWAVE_RADIO_SYSTEM          = 'microwave-radio-system'

    OPEN_LINE_SYSTEM                = 'open-line-system'

    OPTICAL_ROADM                   = 'optical-roadm'

    OPTICAL_TRANSPONDER             = 'optical-transponder'

src/common/tools/object_factory/Device.py

+1 −2
Original line number Diff line number Diff line
@@ -33,8 +33,7 @@ DEVICE_PR_DRIVERS = [DeviceDriverEnum.DEVICEDRIVER_OPENCONFIG] 
DEVICE_TAPI_TYPE    = DeviceTypeEnum.OPEN_LINE_SYSTEM.value

DEVICE_TAPI_DRIVERS = [DeviceDriverEnum.DEVICEDRIVER_TRANSPORT_API]



# check which enum type and value assign to microwave device

DEVICE_MICROWAVE_TYPE    = DeviceTypeEnum.MICROVAWE_RADIO_SYSTEM.value

DEVICE_MICROWAVE_TYPE    = DeviceTypeEnum.MICROWAVE_RADIO_SYSTEM.value

DEVICE_MICROWAVE_DRIVERS = [DeviceDriverEnum.DEVICEDRIVER_IETF_NETWORK_TOPOLOGY]



DEVICE_P4_TYPE      = DeviceTypeEnum.P4_SWITCH.value