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

Merge branch 'openroadm-flex-grid' of https://labs.etsi.org/rep/tfs/controller into cnit_tapi

parents 0ce05093 cd334af1

delete.xml

+343 −6
Changes for delete.xml: 343 added lines, 6 removed lines.
Original line number Diff line number Diff line
@@ -1202,26 +1202,363 @@ 
        </nmc-ctp>

      </interface>

      <interface>

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

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

        <name>MC-TTP-DEG2-AMPTX-OUT-192081250</name>

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

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

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

        <supporting-circuit-pack-name>DEG2-AMPTX</supporting-circuit-pack-name>

        <supporting-port>DEG2-AMPTX-OUT</supporting-port>

        <supporting-interface-list>OMS-DEG2-TTP-TX</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>

        <supporting-interface-list>NMC-DEG2-AMPTX-OUT-192081250</supporting-interface-list>

      </interface>

      <interface>

        <name>NMC-DEG2-AMPTX-OUT-192081250</name>

        <description>Media-channel-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>

        <supporting-circuit-pack-name>DEG2-AMPTX</supporting-circuit-pack-name>

        <supporting-port>DEG2-AMPTX-OUT</supporting-port>

        <supporting-interface-list>OMS-DEG2-TTP-TX</supporting-interface-list>

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

          <frequency>192081250</frequency>

          <width>150000</width>

        </nmc-ctp>

        <supporting-interface-list>NMC-DEG2-AMPTX-OUT-192081250</supporting-interface-list>

      </interface>

      <roadm-connections>

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

        <connection-name>NMC-DEG1-AMPRX-IN-192081250 to NMC-DEG2-AMPTX-OUT-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>

          <dst-if>NMC-DEG2-AMPTX-OUT-192081250</dst-if>

        </destination>

      </roadm-connections>

      <interface>

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

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

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

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

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

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

        <supporting-interface-list>OMS-DEG2-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>

        <supporting-interface-list>NMC-DEG2-AMPRX-IN-192081250</supporting-interface-list>

      </interface>

      <interface>

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

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

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

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

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

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

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

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

          <frequency>192081250</frequency>

          <width>150000</width>

        </nmc-ctp>

        <supporting-interface-list>NMC-DEG2-AMPRX-IN-192081250</supporting-interface-list>

      </interface>

      <interface>

        <name>MC-TTP-DEG1-AMPTX-OUT-192081250</name>

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

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

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

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

        <supporting-port>DEG1-AMPTX-OUT</supporting-port>

        <supporting-interface-list>OMS-DEG1-TTP-TX</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-AMPTX-OUT-192081250</name>

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

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

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

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

        <supporting-port>DEG1-AMPTX-OUT</supporting-port>

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

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

          <frequency>192081250</frequency>

          <width>150000</width>

        </nmc-ctp>

      </interface>

      <roadm-connections>

        <connection-name>NMC-DEG2-AMPRX-IN-192081250 to NMC-DEG1-AMPTX-OUT-192081250</connection-name>

        <opticalControlMode>off</opticalControlMode>

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

        <source>

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

        </source>

        <destination>

          <dst-if>NMC-DEG1-AMPTX-OUT-192081250</dst-if>

        </destination>

      </roadm-connections>

      <interface>

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

        <description>Media-channel-186131250THz</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>186206250.0</max-freq>

          <min-freq>186056250.0</min-freq>

        </mc-ttp>

      </interface>

      <interface>

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

        <description>Media-channel-186131250THz</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>186131250</frequency>

          <width>150000</width>

        </nmc-ctp>

      </interface>

      <interface>

        <name>MC-TTP-DEG2-AMPTX-OUT-186131250</name>

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

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

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

        <supporting-circuit-pack-name>DEG2-AMPTX</supporting-circuit-pack-name>

        <supporting-port>DEG2-AMPTX-OUT</supporting-port>

        <supporting-interface-list>NMC-DEG2-AMPTX-OUT-192081250</supporting-interface-list>

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

          <max-freq>186206250.0</max-freq>

          <min-freq>186056250.0</min-freq>

        </mc-ttp>

        <supporting-interface-list>OMS-DEG2-TTP-TX</supporting-interface-list>

      </interface>

      <interface>

        <name>NMC-DEG2-AMPTX-OUT-186131250</name>

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

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

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

        <supporting-circuit-pack-name>DEG2-AMPTX</supporting-circuit-pack-name>

        <supporting-port>DEG2-AMPTX-OUT</supporting-port>

        <supporting-interface-list>NMC-DEG2-AMPTX-OUT-192081250</supporting-interface-list>

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

          <frequency>186131250</frequency>

          <width>150000</width>

        </nmc-ctp>

        <supporting-interface-list>OMS-DEG2-TTP-TX</supporting-interface-list>

      </interface>

      <roadm-connections>

        <connection-name>NMC-DEG1-AMPRX-IN-186131250 to NMC-DEG2-AMPTX-OUT-186131250</connection-name>

        <opticalControlMode>off</opticalControlMode>

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

        <source>

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

        </source>

        <destination>

          <dst-if>NMC-DEG2-AMPTX-OUT-186131250</dst-if>

        </destination>

      </roadm-connections>

      <interface>

        <name>MC-TTP-DEG2-AMPRX-IN-186131250</name>

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

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

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

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

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

        <supporting-interface-list>NMC-DEG2-AMPRX-IN-192081250</supporting-interface-list>

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

          <max-freq>186206250.0</max-freq>

          <min-freq>186056250.0</min-freq>

        </mc-ttp>

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

      </interface>

      <interface>

        <name>NMC-DEG2-AMPRX-IN-186131250</name>

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

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

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

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

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

        <supporting-interface-list>NMC-DEG2-AMPRX-IN-192081250</supporting-interface-list>

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

          <frequency>186131250</frequency>

          <width>150000</width>

        </nmc-ctp>

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

      </interface>

      <interface>

        <name>MC-TTP-DEG1-AMPTX-OUT-186131250</name>

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

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

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

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

        <supporting-port>DEG1-AMPTX-OUT</supporting-port>

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

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

          <max-freq>186206250.0</max-freq>

          <min-freq>186056250.0</min-freq>

        </mc-ttp>

      </interface>

      <interface>

        <name>NMC-DEG1-AMPTX-OUT-186131250</name>

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

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

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

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

        <supporting-port>DEG1-AMPTX-OUT</supporting-port>

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

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

          <frequency>186131250</frequency>

          <width>150000</width>

        </nmc-ctp>

      </interface>

      <roadm-connections>

        <connection-name>NMC-DEG2-AMPRX-IN-186131250 to NMC-DEG1-AMPTX-OUT-186131250</connection-name>

        <opticalControlMode>off</opticalControlMode>

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

        <source>

          <src-if>NMC-DEG2-AMPRX-IN-186131250</src-if>

        </source>

        <destination>

          <dst-if>NMC-DEG1-AMPTX-OUT-186131250</dst-if>

        </destination>

      </roadm-connections>

      <interface>

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

        <description>Media-channel-202531250THz</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>202606250.0</max-freq>

          <min-freq>202456250.0</min-freq>

        </mc-ttp>

      </interface>

      <interface>

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

        <description>Media-channel-202531250THz</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>202531250</frequency>

          <width>150000</width>

        </nmc-ctp>

      </interface>

      <interface>

        <name>MC-TTP-DEG2-AMPTX-OUT-202531250</name>

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

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

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

        <supporting-circuit-pack-name>DEG2-AMPTX</supporting-circuit-pack-name>

        <supporting-port>DEG2-AMPTX-OUT</supporting-port>

        <supporting-interface-list>OMS-DEG2-TTP-TX</supporting-interface-list>

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

          <max-freq>202606250.0</max-freq>

          <min-freq>202456250.0</min-freq>

        </mc-ttp>

      </interface>

      <interface>

        <name>NMC-DEG2-AMPTX-OUT-202531250</name>

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

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

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

        <supporting-circuit-pack-name>DEG2-AMPTX</supporting-circuit-pack-name>

        <supporting-port>DEG2-AMPTX-OUT</supporting-port>

        <supporting-interface-list>OMS-DEG2-TTP-TX</supporting-interface-list>

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

          <frequency>202531250</frequency>

          <width>150000</width>

        </nmc-ctp>

      </interface>

      <roadm-connections>

        <connection-name>NMC-DEG1-AMPRX-IN-202531250 to NMC-DEG2-AMPTX-OUT-202531250</connection-name>

        <opticalControlMode>off</opticalControlMode>

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

        <source>

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

        </source>

        <destination>

          <dst-if>NMC-DEG2-AMPTX-OUT-202531250</dst-if>

        </destination>

      </roadm-connections>

      <interface>

        <name>MC-TTP-DEG2-AMPRX-IN-202531250</name>

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

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

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

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

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

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

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

          <max-freq>202606250.0</max-freq>

          <min-freq>202456250.0</min-freq>

        </mc-ttp>

      </interface>

      <interface>

        <name>NMC-DEG2-AMPRX-IN-202531250</name>

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

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

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

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

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

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

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

          <frequency>202531250</frequency>

          <width>150000</width>

        </nmc-ctp>

      </interface>

      <interface>

        <name>MC-TTP-DEG1-AMPTX-OUT-202531250</name>

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

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

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

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

        <supporting-port>DEG1-AMPTX-OUT</supporting-port>

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

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

          <max-freq>202606250.0</max-freq>

          <min-freq>202456250.0</min-freq>

        </mc-ttp>

      </interface>

      <interface>

        <name>NMC-DEG1-AMPTX-OUT-202531250</name>

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

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

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

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

        <supporting-port>DEG1-AMPTX-OUT</supporting-port>

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

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

          <frequency>202531250</frequency>

          <width>150000</width>

        </nmc-ctp>

      </interface>

      <roadm-connections>

        <connection-name>NMC-DEG2-AMPRX-IN-202531250 to NMC-DEG1-AMPTX-OUT-202531250</connection-name>

        <opticalControlMode>off</opticalControlMode>

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

        <source>

          <src-if>NMC-DEG2-AMPRX-IN-202531250</src-if>

        </source>

        <destination>

          <dst-if>NMC-DEG1-AMPTX-OUT-202531250</dst-if>

        </destination>

      </roadm-connections>

    </org-openroadm-device>

delete0.xml

0 → 100644
+1322 −0

File added.

Preview size limit exceeded, changes collapsed.

delete1.json

deleted100644 → 0
+0 −230

File deleted.

Preview size limit exceeded, changes collapsed.

delete1.py

0 → 100644
+7 −0
Changes for delete1.py: 7 added lines, 0 removed lines.
Original line number Diff line number Diff line 
text = [{'resource_key': 'channel_namespace', 'value': None}, {'resource_key': 'add_transceiver', 'value': None}, 

        {'resource_key': 'source_port', 'value': ['SRG1-IN3', 'DEG1-AMPRX-IN']},

        {'resource_key': 'destination_port', 'value': ['DEG1-AMPTX-OUT', 'SRG1-OUT3']},

        {'resource_key': 'handled_flow', 

         'value': [('SRG1-IN3', 'DEG1-AMPTX-OUT'), ('DEG1-AMPRX-IN', 'SRG1-OUT3')]}, {'resource_key': 'target-output-power', 'value': '1.0'}, {'resource_key': 'frequency', 'value': 192081250}, {'resource_key': 'operational-mode', 'value': 8}, {'resource_key': 'line-port', 'value': None}, {'resource_key': 'admin-state', 'value': 'ENABLED'}, {'resource_key': 'name', 'value': 'C_BAND'}, {'resource_key': 'optical-band-parent', 'value': None}, {'resource_key': 'bidir', 'value': 1}, {'resource_key': 'band', 'value': 150000}, {'resource_key': 'interface_list-SRG1-IN3', 'value': 'Null'}, {'resource_key': 'supporting-circuit-pack-name-SRG1-IN3', 'value': 'SRG1-WSS'}, {'resource_key': 'administrative_state-SRG1-IN3', 'value': 'inService'}, {'resource_key': 'frequency', 'value': 0.0}, {'resource_key': 'interface_type-SRG1-IN3', 'value': 'Null'}, {'resource_key': 'interface_list-DEG1-AMPTX-OUT', 'value': 'OMS-DEG1-TTP-TX'}, {'resource_key': 'supporting-circuit-pack-name-DEG1-AMPTX-OUT', 'value': 'DEG1-AMPTX'}, {'resource_key': 'administrative_state-DEG1-AMPTX-OUT', 'value': 'inService'}, {'resource_key': 'frequency', 'value': 0.0}, {'resource_key': 'interface_type-DEG1-AMPTX-OUT', 'value': 'Null'}, {'resource_key': 'interface_list-DEG1-AMPRX-IN', 'value': 'OMS-DEG1-TTP-RX'}, {'resource_key': 'supporting-circuit-pack-name-DEG1-AMPRX-IN', 'value': 'DEG1-AMPRX'}, {'resource_key': 'administrative_state-DEG1-AMPRX-IN', 'value': 'inService'}, {'resource_key': 'frequency', 'value': 0.0}, {'resource_key': 'interface_type-DEG1-AMPRX-IN', 'value': 'Null'}, {'resource_key': 'interface_list-SRG1-OUT3', 'value': 'Null'}, {'resource_key': 'supporting-circuit-pack-name-SRG1-OUT3', 'value': 'SRG1-WSS'}, {'resource_key': 'administrative_state-SRG1-OUT3', 'value': 'inService'}, {'resource_key': 'frequency', 'value': 0.0}, {'resource_key': 'interface_type-SRG1-OUT3', 'value': 'Null'}, 

        {'resource_key': 'lower-frequency', 'value': None},

        {'resource_key': 'upper-frequency', 'value': None}] 
 No newline at end of file

delete1.xml

0 → 100644
+1294 −0

File added.

Preview size limit exceeded, changes collapsed.