Pre-merge code cleanup, remove unneeded files (a3e0231a) · Commits · TFS / controller

src/device/service/drivers/init.py

+13 −15

Original line number	Diff line number	Diff line
		@@ -98,19 +98,19 @@ if LOAD_ALL_DEVICE_DRIVERS:
		}
		]))

		# if LOAD_ALL_DEVICE_DRIVERS:
		# from .gnmi_openconfig.GnmiOpenConfigDriver import GnmiOpenConfigDriver # pylint: disable=wrong-import-position
		# DRIVERS.append(
		# (GnmiOpenConfigDriver, [
		# {
		# # Real Packet Router, specifying gNMI OpenConfig Driver => use GnmiOpenConfigDriver
		# FilterFieldEnum.DEVICE_TYPE: [
		# DeviceTypeEnum.PACKET_POP,
		# DeviceTypeEnum.PACKET_ROUTER,
		# ],
		# FilterFieldEnum.DRIVER : DeviceDriverEnum.DEVICEDRIVER_GNMI_OPENCONFIG,
		# }
		# ]))
		if LOAD_ALL_DEVICE_DRIVERS:
		from .gnmi_openconfig.GnmiOpenConfigDriver import GnmiOpenConfigDriver # pylint: disable=wrong-import-position
		DRIVERS.append(
		(GnmiOpenConfigDriver, [
		{
		# Real Packet Router, specifying gNMI OpenConfig Driver => use GnmiOpenConfigDriver
		FilterFieldEnum.DEVICE_TYPE: [
		DeviceTypeEnum.PACKET_POP,
		DeviceTypeEnum.PACKET_ROUTER,
		],
		FilterFieldEnum.DRIVER : DeviceDriverEnum.DEVICEDRIVER_GNMI_OPENCONFIG,
		}
		]))

		if LOAD_ALL_DEVICE_DRIVERS:
		from .gnmi_nokia_srlinux.GnmiNokiaSrLinuxDriver import GnmiNokiaSrLinuxDriver # pylint: disable=wrong-import-position
		@@ -234,7 +234,6 @@ if LOAD_ALL_DEVICE_DRIVERS:
		# Real Packet Router, specifying OpenConfig Driver => use OpenConfigDriver
		FilterFieldEnum.DEVICE_TYPE: [
		DeviceTypeEnum.OPEN_ROADM,

		],
		FilterFieldEnum.DRIVER : DeviceDriverEnum.DEVICEDRIVER_OPENROADM,
		}
		@@ -250,4 +249,3 @@ if LOAD_ALL_DEVICE_DRIVERS:
		FilterFieldEnum.DRIVER : DeviceDriverEnum.DEVICEDRIVER_QKD,
		}
		]))

src/device/tests/dscm/actual_hub.xml

deleted100644 → 0

+0 −21

Original line number	Diff line number	Diff line
		<digital-subcarriers-group>
		<digital-subcarriers-group-id>1</digital-subcarriers-group-id>
		<number-of-digital-subcarriers>4</number-of-digital-subcarriers>
		<digital-subcarrier-group-size>100</digital-subcarrier-group-size>
		<digital-subcarrier-id>
		<subcarrier-id>1</subcarrier-id>
		<active>false</active>
		</digital-subcarrier-id>
		<digital-subcarrier-id>
		<subcarrier-id>2</subcarrier-id>
		<active>false</active>
		</digital-subcarrier-id>
		<digital-subcarrier-id>
		<subcarrier-id>3</subcarrier-id>
		<active>false</active>
		</digital-subcarrier-id>
		<digital-subcarrier-id>
		<subcarrier-id>4</subcarrier-id>
		<active>false</active>
		</digital-subcarrier-id>
		</digital-subcarriers-group>

src/device/tests/dscm/rendered_hub.xml

deleted100644 → 0

+0 −60

Original line number	Diff line number	Diff line
		<components xmlns="http://openconfig.net/yang/platform">
		<component xmlns:nc="urn:ietf:params:xml:ns:netconf:base:1.0" nc:operation="merge">
		<name>channel-1</name>
		<optical-channel xmlns="http://openconfig.net/yang/terminal-device-digital-subcarriers">
		<config>
		<frequency>195000000</frequency>
		<target-output-power>0.0</target-output-power>
		<operational-mode>9</operational-mode>
		<digital-subcarriers-group>
		<digital-subcarriers-group-id>1</digital-subcarriers-group-id>

		<digital-subcarrier-id>
		<subcarrier-id>1</subcarrier-id>
		<active>True</active>
		</digital-subcarrier-id>

		<digital-subcarrier-id>
		<subcarrier-id>2</subcarrier-id>
		<active>True</active>
		</digital-subcarrier-id>

		<digital-subcarrier-id>
		<subcarrier-id>3</subcarrier-id>
		<active>True</active>
		</digital-subcarrier-id>

		<digital-subcarrier-id>
		<subcarrier-id>4</subcarrier-id>
		<active>True</active>
		</digital-subcarrier-id>

		</digital-subcarriers-group>

		<digital-subcarriers-group>
		<digital-subcarriers-group-id>1</digital-subcarriers-group-id>

		<digital-subcarrier-id>
		<subcarrier-id>5</subcarrier-id>
		<active>True</active>
		</digital-subcarrier-id>

		<digital-subcarrier-id>
		<subcarrier-id>6</subcarrier-id>
		<active>True</active>
		</digital-subcarrier-id>

		<digital-subcarrier-id>
		<subcarrier-id>7</subcarrier-id>
		<active>True</active>
		</digital-subcarrier-id>

		<digital-subcarrier-id>
		<subcarrier-id>8</subcarrier-id>
		<active>True</active>
		</digital-subcarrier-id>
		</digital-subcarriers-group>
		</config>
		</optical-channel>
		</component>
		</components>