use previous ChannelId for l2sm

scheduler/infrastructure/channels.go

@@ -44,7 +44,7 @@ func ChannelServiceName(channel crd.Channel) string {
 // ChannelId returns an id for this channel that combines namespace and name
 // into one string.
 func ChannelId(channel crd.Channel) string {
-	return fmt.Sprintf("%s-%s", channel.Namespace, channel.Name)
+	return fmt.Sprintf("%s_%s", channel.Namespace, channel.Name)
 }
 
 // ParseChannelId expects a channel id created by ChannelId() and

scheduler/network/channel-controller/l2sm_controller.go

@@ -412,6 +412,7 @@ func (l *L2SMReconciler) SetupWithManager(mgr ctrl.Manager) error {
 	return ctrl.NewControllerManagedBy(mgr).For(&crd.Channel{}).
 		Watches(&crd.NetworkLink{}, handler.EnqueueRequestsFromMapFunc(l.setupLinkHandlerMapFunc())).
 		Watches(&crd.Ipam{}, handler.EnqueueRequestsFromMapFunc(l.setupIpamHandlerMapFunc())).
-		Watches(&corev1.Pod{}, handler.EnqueueRequestsFromMapFunc(l.setupPodHandlerMapFunc())).
+		//  disable Pod watches, probably not used/required currently
+		//	Watches(&corev1.Pod{}, handler.EnqueueRequestsFromMapFunc(l.setupPodHandlerMapFunc())). 
 		Complete(l)
 }

scheduler/network/channel-controller/l2sm_util.go

@@ -58,7 +58,7 @@ func MakeVlink(channel crd.Channel, path *crd.NetworkPath) l2sm.L2Network {
 			Kind:       "L2Network",
 		},
 		ObjectMeta: metav1.ObjectMeta{
-			Name:      infrastructure.ChannelId(channel),
+			Name:      channel.Name,		// using only the channel name is unambiguous, since vlink is currently in the same namespace as the channel
 			Namespace: channel.Namespace,
 			Labels: map[string]string{
 				"channel": infrastructure.ChannelId(channel),