Commit eabcbf21 authored by Mohammad Ismaeel's avatar Mohammad Ismaeel
Browse files

deconfigure openroadm

parent 492ce5ea

delete.xml

+54 −5
Original line number Diff line number Diff line
@@ -87,7 +87,7 @@ 
      </circuit-packs>

      <circuit-packs>

        <circuit-pack-name>DEG1-WSS</circuit-pack-name>

        <circuit-pack-type>dummy-wss</circuit-pack-type>

        <circuit-pack-type>hhi-wss</circuit-pack-type>

        <administrative-state>inService</administrative-state>

        <circuit-pack-product-code/>

        <equipment-state>not-reserved-inuse</equipment-state>
@@ -207,7 +207,7 @@ 
      </circuit-packs>

      <circuit-packs>

        <circuit-pack-name>DEG2-WSS</circuit-pack-name>

        <circuit-pack-type>dummy-wss</circuit-pack-type>

        <circuit-pack-type>hhi-wss</circuit-pack-type>

        <circuit-pack-product-code/>

        <administrative-state>inService</administrative-state>

        <equipment-state>not-reserved-inuse</equipment-state>
@@ -327,7 +327,7 @@ 
      </circuit-packs>

      <circuit-packs>

        <circuit-pack-name>DEG3-WSS</circuit-pack-name>

        <circuit-pack-type>dummy-wss</circuit-pack-type>

        <circuit-pack-type>hhi-wss</circuit-pack-type>

        <circuit-pack-product-code/>

        <administrative-state>inService</administrative-state>

        <equipment-state>not-reserved-inuse</equipment-state>
@@ -447,7 +447,7 @@ 
      </circuit-packs>

      <circuit-packs>

        <circuit-pack-name>DEG4-WSS</circuit-pack-name>

        <circuit-pack-type>dummy-wss</circuit-pack-type>

        <circuit-pack-type>hhi-wss</circuit-pack-type>

        <circuit-pack-product-code/>

        <administrative-state>inService</administrative-state>

        <equipment-state>not-reserved-inuse</equipment-state>
@@ -527,7 +527,7 @@ 
      </circuit-packs>

      <circuit-packs>

        <circuit-pack-name>SRG1-WSS</circuit-pack-name>

        <circuit-pack-type>dummy-wss</circuit-pack-type>

        <circuit-pack-type>hhi-wss</circuit-pack-type>

        <circuit-pack-product-code/>

        <administrative-state>inService</administrative-state>

        <equipment-state>not-reserved-inuse</equipment-state>
@@ -1175,6 +1175,55 @@ 
        <supporting-port>DEG4-AMPTX-OUT</supporting-port>

        <supporting-interface-list>OTS-DEG4-TTP-TX</supporting-interface-list>

      </interface>

      <interface>

        <name>MC-TTP-DEG1-AMPRX-IN-192081250</name>

        <description>Media-channel-192081250THz</description>

        <type>openROADM-if:mediaChannelTrailTerminationPoint</type>

        <administrative-state>inService</administrative-state>

        <supporting-circuit-pack-name>DEG1-AMPRX</supporting-circuit-pack-name>

        <supporting-port>DEG1-AMPRX-IN</supporting-port>

        <supporting-interface-list>OMS-DEG1-TTP-RX</supporting-interface-list>

        <mc-ttp xmlns="http://org/openroadm/media-channel-interfaces">

          <max-freq>192156250.0</max-freq>

          <min-freq>192006250.0</min-freq>

        </mc-ttp>

      </interface>

      <interface>

        <name>NMC-DEG1-AMPRX-IN-192081250</name>

        <description>Media-channel-192081250THz</description>

        <type>openROADM-if:networkMediaChannelConnectionTerminationPoint</type>

        <administrative-state>inService</administrative-state>

        <supporting-circuit-pack-name>DEG1-AMPRX</supporting-circuit-pack-name>

        <supporting-port>DEG1-AMPRX-IN</supporting-port>

        <supporting-interface-list>OMS-DEG1-TTP-RX</supporting-interface-list>

        <nmc-ctp xmlns="http://org/openroadm/network-media-channel-interfaces">

          <frequency>192081250</frequency>

          <width>150000</width>

        </nmc-ctp>

      </interface>

      <interface>

        <name>NMC-SRG-SRG1-OUT1-192081250</name>

        <description>Network-Media-Channel-CTP-192081250THz</description>

        <type>openROADM-if:networkMediaChannelConnectionTerminationPoint</type>

        <administrative-state>inService</administrative-state>

        <supporting-circuit-pack-name>SRG1-WSS</supporting-circuit-pack-name>

        <supporting-port>SRG1-OUT1</supporting-port>

        <nmc-ctp xmlns="http://org/openroadm/network-media-channel-interfaces">

          <frequency>192081250</frequency>

          <width>150000</width>

        </nmc-ctp>

      </interface>

      <roadm-connections>

        <connection-name>NMC-DEG1-AMPRX-IN-192081250 to NMC-SRG-SRG1-OUT1-192081250</connection-name>

        <opticalControlMode>off</opticalControlMode>

        <target-output-power>0</target-output-power>

        <source>

          <src-if>NMC-DEG1-AMPRX-IN-192081250</src-if>

        </source>

        <destination>

          <dst-if>NMC-SRG-SRG1-OUT1-192081250</dst-if>

        </destination>

      </roadm-connections>

    </org-openroadm-device>

    <netopeer xmlns="urn:cesnet:tmc:netopeer:1.0">

      <modules>

delete.json→delete1.json

+0 −0

File moved.

View file

manifests/serviceservice.yaml

+1 −1
Original line number Diff line number Diff line
@@ -36,7 +36,7 @@ spec: 
            - containerPort: 9192

          env:

            - name: LOG_LEVEL

              value: "INFO"

              value: "DEBUG"

          readinessProbe:

            exec:

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

src/device/service/OpenConfigServicer.py

+1 −1
Original line number Diff line number Diff line
@@ -163,7 +163,7 @@ class OpenConfigServicer(DeviceServiceServicer): 
        resources : list[dict] = []

        is_all_good = True

        config = json.loads(request.config)

        LOGGER.info(f"from disable optical device {config}")

        #LOGGER.info(f"from disable optical device {config}")

        try:

            context_client = ContextClient()

            device = get_device(

src/device/service/Tools.py

+6 −6
Original line number Diff line number Diff line
@@ -475,13 +475,9 @@ def update_endpoints(src_device : Device, dst_device : Device) -> None: 
            if len(src_context_uuid) > 0: dst_topology_id.context_id.context_uuid.uuid = src_context_uuid



def get_edit_target(device : Device, is_opticalband : bool,has_flow_id:bool) -> str:

    if is_opticalband:

        if device.device_type == DeviceTypeEnum.OPEN_ROADM._value_: return 'mc'

        return 'optical-band'

    if is_opticalband:return 'optical-band'

    if device.device_type == DeviceTypeEnum.OPTICAL_ROADM._value_: return 'media-channel'

    if device.device_type == DeviceTypeEnum.OPEN_ROADM._value_: 

        

        return 'srg' if has_flow_id else 'mc'

    if device.device_type == DeviceTypeEnum.OPEN_ROADM._value_: return 'or'

    return 'optical-channel'



def is_key_existed(key : str, keys_dic = dict, key_name_to_use = None) -> dict:
@@ -563,6 +559,10 @@ def extract_resources(config : dict, device : Device) -> list[list[dict], dict]: 
                                        resources.append({'resource_key': 'interface_name'+'-'+i+'-'+'nmc', 'value': c["name"]   })

                                        resources.append({'resource_key': 'interface_list'+'-'+i, 'value': c["interface_list"]   })

                                        resources.append({'resource_key': 'interface_type'+'-'+i+'-'+'nmc', 'value': "nmc"  })

                                    elif c['type'] == 'srg':

                                        resources.append({'resource_key': 'interface_name'+'-'+i+'-'+'srg', 'value': c["name"]   })

                                        resources.append({'resource_key': 'interface_list'+'-'+i, 'value': c["interface_list"]   })

                                        resources.append({'resource_key': 'interface_type'+'-'+i+'-'+'srg', 'value': "srg"  })

                                        

                               

        if not is_opticalband: