deletion of flex grid service from optical controller (cd334af1) · Commits · TFS / controller

delete0.xml

+80 −17

Original line number	Original line	Diff line number	Diff line
	@@ -1176,66 +1176,129 @@
	<supporting-interface-list>OTS-DEG4-TTP-TX</supporting-interface-list>		<supporting-interface-list>OTS-DEG4-TTP-TX</supporting-interface-list>
	</interface>		</interface>
	<interface>		<interface>
	<name>MC-TTP-DEG1-AMPRX-IN-186131250</name>		<name>MC-TTP-DEG1-AMPRX-IN-192081250</name>
	<description>Media-channel-186131250THz</description>		<description>Media-channel-192081250THz</description>
	<type>openROADM-if:mediaChannelTrailTerminationPoint</type>		<type>openROADM-if:mediaChannelTrailTerminationPoint</type>
	<administrative-state>inService</administrative-state>		<administrative-state>inService</administrative-state>
	<supporting-circuit-pack-name>DEG1-AMPRX</supporting-circuit-pack-name>		<supporting-circuit-pack-name>DEG1-AMPRX</supporting-circuit-pack-name>
	<supporting-port>DEG1-AMPRX-IN</supporting-port>		<supporting-port>DEG1-AMPRX-IN</supporting-port>
	<supporting-interface-list>OMS-DEG1-TTP-RX</supporting-interface-list>		<supporting-interface-list>OMS-DEG1-TTP-RX</supporting-interface-list>
	<mc-ttp xmlns="http://org/openroadm/media-channel-interfaces">		<mc-ttp xmlns="http://org/openroadm/media-channel-interfaces">
	<max-freq>186206250.0</max-freq>		<max-freq>192156250.0</max-freq>
	<min-freq>186056250.0</min-freq>		<min-freq>192006250.0</min-freq>
	</mc-ttp>		</mc-ttp>
	</interface>		</interface>
	<interface>		<interface>
	<name>NMC-DEG1-AMPRX-IN-186131250</name>		<name>NMC-DEG1-AMPRX-IN-192081250</name>
	<description>Media-channel-186131250THz</description>		<description>Media-channel-192081250THz</description>
	<type>openROADM-if:networkMediaChannelConnectionTerminationPoint</type>		<type>openROADM-if:networkMediaChannelConnectionTerminationPoint</type>
	<administrative-state>inService</administrative-state>		<administrative-state>inService</administrative-state>
	<supporting-circuit-pack-name>DEG1-AMPRX</supporting-circuit-pack-name>		<supporting-circuit-pack-name>DEG1-AMPRX</supporting-circuit-pack-name>
	<supporting-port>DEG1-AMPRX-IN</supporting-port>		<supporting-port>DEG1-AMPRX-IN</supporting-port>
	<supporting-interface-list>OMS-DEG1-TTP-RX</supporting-interface-list>		<supporting-interface-list>OMS-DEG1-TTP-RX</supporting-interface-list>
	<nmc-ctp xmlns="http://org/openroadm/network-media-channel-interfaces">		<nmc-ctp xmlns="http://org/openroadm/network-media-channel-interfaces">
	<frequency>186131250</frequency>		<frequency>192081250</frequency>
	<width>150000</width>		<width>150000</width>
	</nmc-ctp>		</nmc-ctp>
	</interface>		</interface>
	<interface>		<interface>
	<name>MC-TTP-DEG2-AMPTX-OUT-186131250</name>		<name>MC-TTP-DEG2-AMPTX-OUT-192081250</name>
	<description>Media-channel-186131250THz</description>		<description>Media-channel-192081250THz</description>
	<type>openROADM-if:mediaChannelTrailTerminationPoint</type>		<type>openROADM-if:mediaChannelTrailTerminationPoint</type>
	<administrative-state>inService</administrative-state>		<administrative-state>inService</administrative-state>
	<supporting-circuit-pack-name>DEG2-AMPTX</supporting-circuit-pack-name>		<supporting-circuit-pack-name>DEG2-AMPTX</supporting-circuit-pack-name>
	<supporting-port>DEG2-AMPTX-OUT</supporting-port>		<supporting-port>DEG2-AMPTX-OUT</supporting-port>
	<supporting-interface-list>OMS-DEG2-TTP-TX</supporting-interface-list>		<supporting-interface-list>OMS-DEG2-TTP-TX</supporting-interface-list>
	<mc-ttp xmlns="http://org/openroadm/media-channel-interfaces">		<mc-ttp xmlns="http://org/openroadm/media-channel-interfaces">
	<max-freq>186206250.0</max-freq>		<max-freq>192156250.0</max-freq>
	<min-freq>186056250.0</min-freq>		<min-freq>192006250.0</min-freq>
	</mc-ttp>		</mc-ttp>
	</interface>		</interface>
	<interface>		<interface>
	<name>NMC-DEG2-AMPTX-OUT-186131250</name>		<name>NMC-DEG2-AMPTX-OUT-192081250</name>
	<description>Media-channel-186131250THz</description>		<description>Media-channel-192081250THz</description>
	<type>openROADM-if:networkMediaChannelConnectionTerminationPoint</type>		<type>openROADM-if:networkMediaChannelConnectionTerminationPoint</type>
	<administrative-state>inService</administrative-state>		<administrative-state>inService</administrative-state>
	<supporting-circuit-pack-name>DEG2-AMPTX</supporting-circuit-pack-name>		<supporting-circuit-pack-name>DEG2-AMPTX</supporting-circuit-pack-name>
	<supporting-port>DEG2-AMPTX-OUT</supporting-port>		<supporting-port>DEG2-AMPTX-OUT</supporting-port>
	<supporting-interface-list>OMS-DEG2-TTP-TX</supporting-interface-list>		<supporting-interface-list>OMS-DEG2-TTP-TX</supporting-interface-list>
	<nmc-ctp xmlns="http://org/openroadm/network-media-channel-interfaces">		<nmc-ctp xmlns="http://org/openroadm/network-media-channel-interfaces">
	<frequency>186131250</frequency>		<frequency>192081250</frequency>
	<width>150000</width>		<width>150000</width>
	</nmc-ctp>		</nmc-ctp>
	</interface>		</interface>
	<roadm-connections>		<roadm-connections>
	<connection-name>NMC-DEG1-AMPRX-IN-186131250 to NMC-DEG2-AMPTX-OUT-186131250</connection-name>		<connection-name>NMC-DEG1-AMPRX-IN-192081250 to NMC-DEG2-AMPTX-OUT-192081250</connection-name>
	<opticalControlMode>off</opticalControlMode>		<opticalControlMode>off</opticalControlMode>
	<target-output-power>0</target-output-power>		<target-output-power>0</target-output-power>
	<source>		<source>
	<src-if>NMC-DEG1-AMPRX-IN-186131250</src-if>		<src-if>NMC-DEG1-AMPRX-IN-192081250</src-if>
	</source>		</source>
	<destination>		<destination>
	<dst-if>NMC-DEG2-AMPTX-OUT-186131250</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>
			</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>
			</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>		</destination>
	</roadm-connections>		</roadm-connections>
	</org-openroadm-device>		</org-openroadm-device>

delete1.xml

+62 −13

Original line number	Original line	Diff line number	Diff line
	@@ -1176,52 +1176,101 @@
	<supporting-interface-list>OTS-DEG4-TTP-TX</supporting-interface-list>		<supporting-interface-list>OTS-DEG4-TTP-TX</supporting-interface-list>
	</interface>		</interface>
	<interface>		<interface>
	<name>NMC-SRG-SRG1-IN3-186131250</name>		<name>NMC-SRG-SRG1-IN3-192081250</name>
	<description>Network-Media-Channel-CTP-186131250THz</description>		<description>Network-Media-Channel-CTP-192081250THz</description>
	<type>openROADM-if:networkMediaChannelConnectionTerminationPoint</type>		<type>openROADM-if:networkMediaChannelConnectionTerminationPoint</type>
	<administrative-state>inService</administrative-state>		<administrative-state>inService</administrative-state>
	<supporting-circuit-pack-name>SRG1-WSS</supporting-circuit-pack-name>		<supporting-circuit-pack-name>SRG1-WSS</supporting-circuit-pack-name>
	<supporting-port>SRG1-IN3</supporting-port>		<supporting-port>SRG1-IN3</supporting-port>
	<nmc-ctp xmlns="http://org/openroadm/network-media-channel-interfaces">		<nmc-ctp xmlns="http://org/openroadm/network-media-channel-interfaces">
	<frequency>186131250</frequency>		<frequency>192081250</frequency>
	<width>150000</width>		<width>150000</width>
	</nmc-ctp>		</nmc-ctp>
	</interface>		</interface>
	<interface>		<interface>
	<name>MC-TTP-DEG1-AMPTX-OUT-186131250</name>		<name>MC-TTP-DEG1-AMPTX-OUT-192081250</name>
	<description>Media-channel-186131250THz</description>		<description>Media-channel-192081250THz</description>
	<type>openROADM-if:mediaChannelTrailTerminationPoint</type>		<type>openROADM-if:mediaChannelTrailTerminationPoint</type>
	<administrative-state>inService</administrative-state>		<administrative-state>inService</administrative-state>
	<supporting-circuit-pack-name>DEG1-AMPTX</supporting-circuit-pack-name>		<supporting-circuit-pack-name>DEG1-AMPTX</supporting-circuit-pack-name>
	<supporting-port>DEG1-AMPTX-OUT</supporting-port>		<supporting-port>DEG1-AMPTX-OUT</supporting-port>
	<supporting-interface-list>OMS-DEG1-TTP-TX</supporting-interface-list>		<supporting-interface-list>OMS-DEG1-TTP-TX</supporting-interface-list>
	<mc-ttp xmlns="http://org/openroadm/media-channel-interfaces">		<mc-ttp xmlns="http://org/openroadm/media-channel-interfaces">
	<max-freq>186206250.0</max-freq>		<max-freq>192156250.0</max-freq>
	<min-freq>186056250.0</min-freq>		<min-freq>192006250.0</min-freq>
	</mc-ttp>		</mc-ttp>
	</interface>		</interface>
	<interface>		<interface>
	<name>NMC-DEG1-AMPTX-OUT-186131250</name>		<name>NMC-DEG1-AMPTX-OUT-192081250</name>
	<description>Media-channel-186131250THz</description>		<description>Media-channel-192081250THz</description>
	<type>openROADM-if:networkMediaChannelConnectionTerminationPoint</type>		<type>openROADM-if:networkMediaChannelConnectionTerminationPoint</type>
	<administrative-state>inService</administrative-state>		<administrative-state>inService</administrative-state>
	<supporting-circuit-pack-name>DEG1-AMPTX</supporting-circuit-pack-name>		<supporting-circuit-pack-name>DEG1-AMPTX</supporting-circuit-pack-name>
	<supporting-port>DEG1-AMPTX-OUT</supporting-port>		<supporting-port>DEG1-AMPTX-OUT</supporting-port>
	<supporting-interface-list>OMS-DEG1-TTP-TX</supporting-interface-list>		<supporting-interface-list>OMS-DEG1-TTP-TX</supporting-interface-list>
	<nmc-ctp xmlns="http://org/openroadm/network-media-channel-interfaces">		<nmc-ctp xmlns="http://org/openroadm/network-media-channel-interfaces">
	<frequency>186131250</frequency>		<frequency>192081250</frequency>
	<width>150000</width>		<width>150000</width>
	</nmc-ctp>		</nmc-ctp>
	</interface>		</interface>
	<roadm-connections>		<roadm-connections>
	<connection-name>NMC-SRG-SRG1-IN3-186131250 to NMC-DEG1-AMPTX-OUT-186131250</connection-name>		<connection-name>NMC-SRG-SRG1-IN3-192081250 to NMC-DEG1-AMPTX-OUT-192081250</connection-name>
	<opticalControlMode>off</opticalControlMode>		<opticalControlMode>off</opticalControlMode>
	<target-output-power>0</target-output-power>		<target-output-power>0</target-output-power>
	<source>		<source>
	<src-if>NMC-SRG-SRG1-IN3-186131250</src-if>		<src-if>NMC-SRG-SRG1-IN3-192081250</src-if>
	</source>		</source>
	<destination>		<destination>
	<dst-if>NMC-DEG1-AMPTX-OUT-186131250</dst-if>		<dst-if>NMC-DEG1-AMPTX-OUT-192081250</dst-if>
			</destination>
			</roadm-connections>
			<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-OUT3-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-OUT3</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-OUT3-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-OUT3-192081250</dst-if>
	</destination>		</destination>
	</roadm-connections>		</roadm-connections>
	</org-openroadm-device>		</org-openroadm-device>

delete2.xml

+62 −13

Original line number	Original line	Diff line number	Diff line
	@@ -1176,52 +1176,101 @@
	<supporting-interface-list>OTS-DEG4-TTP-TX</supporting-interface-list>		<supporting-interface-list>OTS-DEG4-TTP-TX</supporting-interface-list>
	</interface>		</interface>
	<interface>		<interface>
	<name>MC-TTP-DEG1-AMPRX-IN-186131250</name>		<name>MC-TTP-DEG1-AMPRX-IN-192081250</name>
	<description>Media-channel-186131250THz</description>		<description>Media-channel-192081250THz</description>
	<type>openROADM-if:mediaChannelTrailTerminationPoint</type>		<type>openROADM-if:mediaChannelTrailTerminationPoint</type>
	<administrative-state>inService</administrative-state>		<administrative-state>inService</administrative-state>
	<supporting-circuit-pack-name>DEG1-AMPRX</supporting-circuit-pack-name>		<supporting-circuit-pack-name>DEG1-AMPRX</supporting-circuit-pack-name>
	<supporting-port>DEG1-AMPRX-IN</supporting-port>		<supporting-port>DEG1-AMPRX-IN</supporting-port>
	<supporting-interface-list>OMS-DEG1-TTP-RX</supporting-interface-list>		<supporting-interface-list>OMS-DEG1-TTP-RX</supporting-interface-list>
	<mc-ttp xmlns="http://org/openroadm/media-channel-interfaces">		<mc-ttp xmlns="http://org/openroadm/media-channel-interfaces">
	<max-freq>186206250.0</max-freq>		<max-freq>192156250.0</max-freq>
	<min-freq>186056250.0</min-freq>		<min-freq>192006250.0</min-freq>
	</mc-ttp>		</mc-ttp>
	</interface>		</interface>
	<interface>		<interface>
	<name>NMC-DEG1-AMPRX-IN-186131250</name>		<name>NMC-DEG1-AMPRX-IN-192081250</name>
	<description>Media-channel-186131250THz</description>		<description>Media-channel-192081250THz</description>
	<type>openROADM-if:networkMediaChannelConnectionTerminationPoint</type>		<type>openROADM-if:networkMediaChannelConnectionTerminationPoint</type>
	<administrative-state>inService</administrative-state>		<administrative-state>inService</administrative-state>
	<supporting-circuit-pack-name>DEG1-AMPRX</supporting-circuit-pack-name>		<supporting-circuit-pack-name>DEG1-AMPRX</supporting-circuit-pack-name>
	<supporting-port>DEG1-AMPRX-IN</supporting-port>		<supporting-port>DEG1-AMPRX-IN</supporting-port>
	<supporting-interface-list>OMS-DEG1-TTP-RX</supporting-interface-list>		<supporting-interface-list>OMS-DEG1-TTP-RX</supporting-interface-list>
	<nmc-ctp xmlns="http://org/openroadm/network-media-channel-interfaces">		<nmc-ctp xmlns="http://org/openroadm/network-media-channel-interfaces">
	<frequency>186131250</frequency>		<frequency>192081250</frequency>
	<width>150000</width>		<width>150000</width>
	</nmc-ctp>		</nmc-ctp>
	</interface>		</interface>
	<interface>		<interface>
	<name>NMC-SRG-SRG1-OUT1-186131250</name>		<name>NMC-SRG-SRG1-OUT1-192081250</name>
	<description>Network-Media-Channel-CTP-186131250THz</description>		<description>Network-Media-Channel-CTP-192081250THz</description>
	<type>openROADM-if:networkMediaChannelConnectionTerminationPoint</type>		<type>openROADM-if:networkMediaChannelConnectionTerminationPoint</type>
	<administrative-state>inService</administrative-state>		<administrative-state>inService</administrative-state>
	<supporting-circuit-pack-name>SRG1-WSS</supporting-circuit-pack-name>		<supporting-circuit-pack-name>SRG1-WSS</supporting-circuit-pack-name>
	<supporting-port>SRG1-OUT1</supporting-port>		<supporting-port>SRG1-OUT1</supporting-port>
	<nmc-ctp xmlns="http://org/openroadm/network-media-channel-interfaces">		<nmc-ctp xmlns="http://org/openroadm/network-media-channel-interfaces">
	<frequency>186131250</frequency>		<frequency>192081250</frequency>
	<width>150000</width>		<width>150000</width>
	</nmc-ctp>		</nmc-ctp>
	</interface>		</interface>
	<roadm-connections>		<roadm-connections>
	<connection-name>NMC-DEG1-AMPRX-IN-186131250 to NMC-SRG-SRG1-OUT1-186131250</connection-name>		<connection-name>NMC-DEG1-AMPRX-IN-192081250 to NMC-SRG-SRG1-OUT1-192081250</connection-name>
	<opticalControlMode>off</opticalControlMode>		<opticalControlMode>off</opticalControlMode>
	<target-output-power>0</target-output-power>		<target-output-power>0</target-output-power>
	<source>		<source>
	<src-if>NMC-DEG1-AMPRX-IN-186131250</src-if>		<src-if>NMC-DEG1-AMPRX-IN-192081250</src-if>
	</source>		</source>
	<destination>		<destination>
	<dst-if>NMC-SRG-SRG1-OUT1-186131250</dst-if>		<dst-if>NMC-SRG-SRG1-OUT1-192081250</dst-if>
			</destination>
			</roadm-connections>
			<interface>
			<name>NMC-SRG-SRG1-IN1-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-IN1</supporting-port>
			<nmc-ctp xmlns="http://org/openroadm/network-media-channel-interfaces">
			<frequency>192081250</frequency>
			<width>150000</width>
			</nmc-ctp>
			</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-SRG-SRG1-IN1-192081250 to NMC-DEG1-AMPTX-OUT-192081250</connection-name>
			<opticalControlMode>off</opticalControlMode>
			<target-output-power>0</target-output-power>
			<source>
			<src-if>NMC-SRG-SRG1-IN1-192081250</src-if>
			</source>
			<destination>
			<dst-if>NMC-DEG1-AMPTX-OUT-192081250</dst-if>
	</destination>		</destination>
	</roadm-connections>		</roadm-connections>
	</org-openroadm-device>		</org-openroadm-device>

src/opticalcontroller/OpticalController.py

+7 −8

Original line number	Original line	Diff line number	Diff line
	@@ -125,10 +125,7 @@ class DelFLightpath(Resource):
	ob_id = flow["parent_opt_band"] if 'parent_opt_band' in flow else None		ob_id = flow["parent_opt_band"] if 'parent_opt_band' in flow else None
	flow['is_active']=False		flow['is_active']=False
	if flow is not None:		if flow is not None:


	bidir = flow["bidir"]		bidir = flow["bidir"]

	if bidir:		if bidir:
	match2 = flow["src"] == dst and flow["dst"] == src and flow["bitrate"] == bitrate		match2 = flow["src"] == dst and flow["dst"] == src and flow["bitrate"] == bitrate
	if match1 or match2:		if match1 or match2:
	@@ -161,8 +158,10 @@ class DelFLightpath(Resource):
	rsa.del_flow(flow,flow_id,ob_id)		rsa.del_flow(flow,flow_id,ob_id)

	if debug:		if debug:
	print(f"vor ob_id {ob_id} rsa.optical_bands {rsa.optical_bands[ob_id]}")
	print(f"rsa.links_dict {rsa.links_dict}")		print(f"rsa.links_dict {rsa.links_dict}")
			if ob_id:
			print(f"vor ob_id {ob_id} rsa.optical_bands {rsa.optical_bands[ob_id]}")

	return "flow {} deleted".format(flow_id), 200		return "flow {} deleted".format(flow_id), 200
	else:		else:
	return "flow {} not matching".format(flow_id), 404		return "flow {} not matching".format(flow_id), 404
	@@ -272,7 +271,7 @@ class DelOpticalBandSimple(Resource):



	@optical.route('/DelLightpath/<int:flow_id>/<string:src>/<string:dst>/<int:bitrate>')		@optical.route('/DelLightpath/<string:src>/<string:dst>/<int:bitrate>/<int:flow_id>')
	@optical.response(200, 'Success')		@optical.response(200, 'Success')
	@optical.response(404, 'Error, not found')		@optical.response(404, 'Error, not found')
	class DelLightpath(Resource):		class DelLightpath(Resource):
	@@ -283,7 +282,7 @@ class DelLightpath(Resource):
	match1 = flow["src"] == src and flow["dst"] == dst and flow["bitrate"] == bitrate		match1 = flow["src"] == src and flow["dst"] == dst and flow["bitrate"] == bitrate
	match2 = flow["src"] == dst and flow["dst"] == src and flow["bitrate"] == bitrate		match2 = flow["src"] == dst and flow["dst"] == src and flow["bitrate"] == bitrate
	if match1 or match2:		if match1 or match2:
	rsa.del_flow(flow)		rsa.del_flow(flow,flow_id)
	rsa.db_flows[flow_id]["is_active"] = False		rsa.db_flows[flow_id]["is_active"] = False
	if debug:		if debug:
	print(rsa.links_dict)		print(rsa.links_dict)

src/opticalcontroller/RSA.py

+13 −13

Original line number	Original line	Diff line number	Diff line
	@@ -128,7 +128,7 @@ class RSA():
	path = shortest_path(self.g, self.g.get_vertex(src), self.g.get_vertex(dst))		path = shortest_path(self.g, self.g.get_vertex(src), self.g.get_vertex(dst))
	print("INFO: Path from {} to {} with distance: {}".format(src, dst, self.g.get_vertex(dst).get_distance()))		print("INFO: Path from {} to {} with distance: {}".format(src, dst, self.g.get_vertex(dst).get_distance()))
	if debug:		if debug:
	print(path)		print(f"compute_path shortest_path {path}")
	links = []		links = []
	for i in range(0, len(path) - 1):		for i in range(0, len(path) - 1):
	s = path[i]		s = path[i]
	@@ -304,14 +304,14 @@ class RSA():
	fib['used'] = False		fib['used'] = False
	#fib[band].sort()		#fib[band].sort()

	def restore_link_2(self, fib, slots, band, link):		# def restore_link_2(self, fib, slots, band, link):
	print("start restoring link")		# print("start restoring link")
	for i in slots:		# for i in slots:
	fib[band][str(i)] = 1		# fib[band][str(i)] = 1
	if 'used' in fib:		# if 'used' in fib:
	fib['used'] = False		# fib['used'] = False
	#fib[band].keys().sort()		# #fib[band].keys().sort()
	#set_link_update(fib,link,test="restoration")		# #set_link_update(fib,link,test="restoration")

	def restore_optical_band(self, optical_band_id, slots, band):		def restore_optical_band(self, optical_band_id, slots, band):

	@@ -357,9 +357,9 @@ class RSA():
	link = self.get_link_by_name(l)		link = self.get_link_by_name(l)
	fib = link["optical_details"]		fib = link["optical_details"]
	#self.restore_link(fib, slots, band)		#self.restore_link(fib, slots, band)
	self.restore_link_2(fib, slots, band, link=link)		self.restore_link(fib, slots, band)
	if debug:		if debug:
	print(fib[band])		print(f"fib[band] {fib[band]}")
	if o_b_id is not None:		if o_b_id is not None:
	if debug:		if debug:
	print("restoring OB")		print("restoring OB")
	@@ -374,13 +374,13 @@ class RSA():
	for l in links:		for l in links:
	r_l = reverse_link(l)		r_l = reverse_link(l)
	if debug:		if debug:
	print(r_l)		print(f"reverse_link {r_l}")
	rlink = self.get_link_by_name(r_l)		rlink = self.get_link_by_name(r_l)
	fib = rlink["optical_details"]		fib = rlink["optical_details"]
	#fib = self.get_link_by_name(r_l)["optical_details"]		#fib = self.get_link_by_name(r_l)["optical_details"]
	if list_in_list(slots, str_list_to_int(fib[band].keys())):		if list_in_list(slots, str_list_to_int(fib[band].keys())):
	#self.restore_link(fib, slots, band, link=l)		#self.restore_link(fib, slots, band, link=l)
	self.restore_link_2(fib, slots, band, link=rlink)		self.restore_link(fib, slots, band)
	if debug:		if debug:
	print(fib[band])		print(fib[band])
	'''		'''