bugs fixed for deletiong flex-grid service (2da985b0) · Commits · TFS / controller

delete.xml

+152 −0

Original line number	Diff line number	Diff line
		@@ -1229,6 +1229,17 @@
		</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-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-DEG2-AMPTX-OUT-192081250</dst-if>
		</destination>
		</roadm-connections>
		<interface>
		<name>MC-TTP-DEG2-AMPRX-IN-192081250</name>
		<description>Media-channel-192081250THz</description>
		@@ -1283,6 +1294,17 @@
		<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>
		@@ -1321,6 +1343,7 @@
		<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>
		@@ -1334,6 +1357,7 @@
		<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>
		@@ -1358,6 +1382,7 @@
		<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>
		@@ -1371,6 +1396,7 @@
		<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>
		@@ -1409,6 +1435,132 @@
		<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>
		<netopeer xmlns="urn:cesnet:tmc:netopeer:1.0">
		<modules>

delete0.xml

0 → 100644

+1259 −0

File added.

Preview size limit exceeded, changes collapsed.

delete1.json

deleted100644 → 0

+0 −230

Original line number	Diff line number	Diff line
		{
		"name": "OMS-DEG3-TTP-TX",
		"type": "Null",
		"administrative_state": "inService",
		"circuit_pack_name": "DEG3-AMPTX",
		"port": "DEG3-AMPTX-IN/DEG3-AMPTX-OUT",
		"interface_list": "OMS-DEG3-TTP-TX",
		"frequency": 0.0,
		"width": 0
		},
		{
		"name": "OMS-DEG2-TTP-RX",
		"type": "Null",
		"administrative_state": "inService",
		"circuit_pack_name": "DEG2-AMPRX",
		"port": "DEG2-AMPRX-IN/DEG2-AMPRX-OUT",
		"interface_list": "OMS-DEG2-TTP-RX",
		"frequency": 0.0,
		"width": 0
		},
		{
		"name": "OMS-DEG2-TTP-RX",
		"type": "Null",
		"administrative_state": "inService",
		"circuit_pack_name": "DEG2-AMPRX",
		"port": "DEG2-AMPRX-IN/DEG2-AMPRX-OUT",
		"interface_list": "OMS-DEG2-TTP-RX",
		"frequency": 0.0,
		"width": 0
		},
		{
		"name": "OMS-DEG4-TTP-RX",
		"type": "Null",
		"administrative_state": "inService",
		"circuit_pack_name": "DEG4-AMPRX",
		"port": "DEG4-AMPRX-IN/DEG4-AMPRX-OUT",
		"interface_list": "OMS-DEG4-TTP-RX",
		"frequency": 0.0,
		"width": 0
		},
		{
		"name": "OMS-DEG3-TTP-RX",
		"type": "Null",
		"administrative_state": "inService",
		"circuit_pack_name": "DEG3-AMPRX",
		"port": "DEG3-AMPRX-IN/DEG3-AMPRX-OUT",
		"interface_list": "OMS-DEG3-TTP-RX",
		"frequency": 0.0,
		"width": 0
		},
		{
		"name": "OMS-DEG2-TTP-TX",
		"type": "Null",
		"administrative_state": "inService",
		"circuit_pack_name": "DEG2-AMPTX",
		"port": "DEG2-AMPTX-IN/DEG2-AMPTX-OUT",
		"interface_list": "OMS-DEG2-TTP-TX",
		"frequency": 0.0,
		"width": 0
		},
		{
		"name": "MC-TTP-DEG1-RX-192056250",
		"type": "mc",
		"administrative_state": "inService",
		"circuit_pack_name": "DEG1-AMPRX",
		"port": "DEG1-AMPRX-OUT",
		"interface_list": "NMC-CTP-DEG1-RX-192056250",
		"frequency": 192056250.0,
		"width": 0
		},
		{
		"name": "DEG2-WSS",
		"type": "Null",
		"administrative_state": "inService",
		"circuit_pack_name": "DEG2-WSS",
		"port": "DEG2-WSS-IN1/DEG2-WSS-IN2/DEG2-WSS-IN3/DEG2-WSS-IN4/DEG2-WSS-IN5/DEG2-WSS-IN6/DEG2-WSS-OUT1/DEG2-WSS-OUT2/DEG2-WSS-OUT3/DEG2-WSS-OUT4/DEG2-WSS-OUT5/DEG2-WSS-OUT6/DEG2-WSS-RX/DEG2-WSS-TX",
		"interface_list": "Null",
		"frequency": 0.0,
		"width": 0
		},
		{
		"name": "OMS-DEG1-TTP-TX",
		"type": "Null",
		"administrative_state": "inService",
		"circuit_pack_name": "DEG1-AMPTX",
		"port": "DEG1-AMPTX-IN/DEG1-AMPTX-OUT",
		"interface_list": "OMS-DEG1-TTP-TX",
		"frequency": 0.0,
		"width": 0
		},
		{
		"name": "DEG1-WSS",
		"type": "Null",
		"administrative_state": "inService",
		"circuit_pack_name": "DEG1-WSS",
		"port": "DEG1-WSS-IN1/DEG1-WSS-IN2/DEG1-WSS-IN3/DEG1-WSS-IN4/DEG1-WSS-IN5/DEG1-WSS-IN6/DEG1-WSS-OUT1/DEG1-WSS-OUT2/DEG1-WSS-OUT3/DEG1-WSS-OUT4/DEG1-WSS-OUT5/DEG1-WSS-OUT6/DEG1-WSS-RX/DEG1-WSS-TX",
		"interface_list": "Null",
		"frequency": 0.0,
		"width": 0
		},
		{
		"name": "OMS-DEG4-TTP-TX",
		"type": "Null",
		"administrative_state": "inService",
		"circuit_pack_name": "DEG4-AMPTX",
		"port": "DEG4-AMPTX-IN/DEG4-AMPTX-OUT",
		"interface_list": "OMS-DEG4-TTP-TX",
		"frequency": 0.0,
		"width": 0
		},
		{
		"name": "OMS-DEG1-TTP-TX",
		"type": "Null",
		"administrative_state": "inService",
		"circuit_pack_name": "DEG1-AMPTX",
		"port": "DEG1-AMPTX-IN/DEG1-AMPTX-OUT",
		"interface_list": "OMS-DEG1-TTP-TX",
		"frequency": 0.0,
		"width": 0
		},
		{
		"name": "DEG4-WSS",
		"type": "Null",
		"administrative_state": "inService",
		"circuit_pack_name": "DEG4-WSS",
		"port": "DEG4-WSS-IN1/DEG4-WSS-IN2/DEG4-WSS-IN3/DEG4-WSS-IN4/DEG4-WSS-IN5/DEG4-WSS-IN6/DEG4-WSS-OUT1/DEG4-WSS-OUT2/DEG4-WSS-OUT3/DEG4-WSS-OUT4/DEG4-WSS-OUT5/DEG4-WSS-OUT6/DEG4-WSS-RX/DEG4-WSS-TX",
		"interface_list": "Null",
		"frequency": 0.0,
		"width": 0
		},
		{
		"name": "OMS-DEG4-TTP-TX",
		"type": "Null",
		"administrative_state": "inService",
		"circuit_pack_name": "DEG4-AMPTX",
		"port": "DEG4-AMPTX-IN/DEG4-AMPTX-OUT",
		"interface_list": "OMS-DEG4-TTP-TX",
		"frequency": 0.0,
		"width": 0
		},
		{
		"name": "OMS-DEG4-TTP-RX",
		"type": "Null",
		"administrative_state": "inService",
		"circuit_pack_name": "DEG4-AMPRX",
		"port": "DEG4-AMPRX-IN/DEG4-AMPRX-OUT",
		"interface_list": "OMS-DEG4-TTP-RX",
		"frequency": 0.0,
		"width": 0
		},
		{
		"name": "NMC-CTP-DEG1-RX-192056250",
		"type": "Null",
		"administrative_state": "inService",
		"circuit_pack_name": "DEG1-AMPRX",
		"port": "DEG1-AMPRX-IN/DEG1-AMPRX-OUT",
		"interface_list": "NMC-CTP-DEG1-RX-192056250",
		"frequency": 0.0,
		"width": 0
		},
		{
		"name": "NMC-CTP-DEG1-RX-192056250",
		"type": "nmc",
		"administrative_state": "inService",
		"circuit_pack_name": "DEG1-AMPRX",
		"port": "DEG1-AMPRX-OUT",
		"interface_list": "NMC-CTP-DEG1-RX-192056250",
		"frequency": 192056250.0,
		"width": 100000
		},
		{
		"name": "OMS-DEG2-TTP-TX",
		"type": "Null",
		"administrative_state": "inService",
		"circuit_pack_name": "DEG2-AMPTX",
		"port": "DEG2-AMPTX-IN/DEG2-AMPTX-OUT",
		"interface_list": "OMS-DEG2-TTP-TX",
		"frequency": 0.0,
		"width": 0
		},
		{
		"name": "NMC-SRG-SRG1-WSS-192031250",
		"type": "Null",
		"administrative_state": "inService",
		"circuit_pack_name": "SRG1-WSS",
		"port": "SRG1-INT-IN1/SRG1-INT-IN2/SRG1-INT-IN3/SRG1-INT-IN4/SRG1-INT-OUT1/SRG1-INT-OUT2/SRG1-INT-OUT3/SRG1-INT-OUT4/SRG1-IN1/SRG1-IN2/SRG1-IN3/SRG1-IN4/SRG1-IN5/SRG1-IN6/SRG1-OUT1/SRG1-OUT2/SRG1-OUT3/SRG1-OUT4/SRG1-OUT5/SRG1-OUT6",
		"interface_list": "NMC-SRG-SRG1-WSS-192031250",
		"frequency": 0.0,
		"width": 0
		},
		{
		"name": "OMS-DEG3-TTP-TX",
		"type": "Null",
		"administrative_state": "inService",
		"circuit_pack_name": "DEG3-AMPTX",
		"port": "DEG3-AMPTX-IN/DEG3-AMPTX-OUT",
		"interface_list": "OMS-DEG3-TTP-TX",
		"frequency": 0.0,
		"width": 0
		},
		{
		"name": "OMS-DEG3-TTP-RX",
		"type": "Null",
		"administrative_state": "inService",
		"circuit_pack_name": "DEG3-AMPRX",
		"port": "DEG3-AMPRX-IN/DEG3-AMPRX-OUT",
		"interface_list": "OMS-DEG3-TTP-RX",
		"frequency": 0.0,
		"width": 0
		},
		{
		"name": "DEG3-WSS",
		"type": "Null",
		"administrative_state": "inService",
		"circuit_pack_name": "DEG3-WSS",
		"port": "DEG3-WSS-IN1/DEG3-WSS-IN2/DEG3-WSS-IN3/DEG3-WSS-IN4/DEG3-WSS-IN5/DEG3-WSS-IN6/DEG3-WSS-OUT1/DEG3-WSS-OUT2/DEG3-WSS-OUT3/DEG3-WSS-OUT4/DEG3-WSS-OUT5/DEG3-WSS-OUT6/DEG3-WSS-RX/DEG3-WSS-TX",
		"interface_list": "Null",
		"frequency": 0.0,
		"width": 0
		},
		{
		"name": "NMC-SRG-SRG1-WSS-192031250",
		"type": "Null",
		"administrative_state": "inService",
		"circuit_pack_name": "SRG1-WSS",
		"port": "SRG1-INT-IN1/SRG1-INT-IN2/SRG1-INT-IN3/SRG1-INT-IN4/SRG1-INT-OUT1/SRG1-INT-OUT2/SRG1-INT-OUT3/SRG1-INT-OUT4/SRG1-IN1/SRG1-IN2/SRG1-IN3/SRG1-IN4/SRG1-IN5/SRG1-IN6/SRG1-OUT1/SRG1-OUT2/SRG1-OUT3/SRG1-OUT4/SRG1-OUT5/SRG1-OUT6",
		"interface_list": "NMC-SRG-SRG1-WSS-192031250",
		"frequency": 0.0,
		"a": 0
		a
		No newline at end of file

delete1.py

0 → 100644

+7 −0

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

+1245 −0

File added.

Preview size limit exceeded, changes collapsed.