A hub node in a wavelength division multiplexed optical network automatically discovers at least one of new client-side optical ports and new edge-side optical ports. The hub node comprises a wavelength switch network, port discovery equipment, and a controller. The wavelength switch network routes any wavelength channel that does not support a matching pair of client-side and edge-side ports to port discovery equipment at the hub node. The port discovery equipment searches for new ports, and, responsive to finding a new port, automatically discovers a predefined set of one or more attributes of the new port. The controller determines that a client-side port and an edge-side port are a matching pair of ports if discovered sets of attributes of those ports match according to one or more predefined rules. The controller then controls the wavelength switch network to re-route the wavelength channel supporting that matching pair between those ports.