Merge pull request #5251 from flavio-fernandes/networkqos-design.udn

network-qos: Expand Network QoS to fully support UDN

Author: girishmg

go-controller/pkg/ovn/controller/network_qos/network_qos.go

@@ -325,6 +325,28 @@ func (c *Controller) networkManagedByMe(networkSelectors crdtypes.NetworkSelecto
 		switch networkSelector.NetworkSelectionType {
 		case crdtypes.DefaultNetwork:
 			return c.IsDefault(), nil
+		case crdtypes.PrimaryUserDefinedNetworks:
+			if !c.IsPrimaryNetwork() {
+				return false, nil
+			}
+			if networkSelector.PrimaryUserDefinedNetworkSelector == nil {
+				return false, fmt.Errorf("empty primary user defined network selector")
+			}
+			selectedNads, err = c.getNetAttachDefsByNamespace(&networkSelector.PrimaryUserDefinedNetworkSelector.NamespaceSelector)
+			if err != nil {
+				return false, err
+			}
+		case crdtypes.SecondaryUserDefinedNetworks:
+			if !c.IsSecondary() {
+				return false, nil
+			}
+			if networkSelector.SecondaryUserDefinedNetworkSelector == nil {
+				return false, fmt.Errorf("empty secondary user defined network selector")
+			}
+			selectedNads, err = c.getNetAttachDefsBySelectors(&networkSelector.SecondaryUserDefinedNetworkSelector.NamespaceSelector, &networkSelector.SecondaryUserDefinedNetworkSelector.NetworkSelector)
+			if err != nil {
+				return false, err
+			}
 		case crdtypes.ClusterUserDefinedNetworks:
 			if networkSelector.ClusterUserDefinedNetworkSelector == nil {
 				return false, fmt.Errorf("empty cluster user defined network selector")
@@ -388,6 +410,28 @@ func (c *Controller) getAllNetworkQoSes() ([]*networkqosapi.NetworkQoS, error) {
 	return nqoses, nil
 }
 
+func (c *Controller) getNetAttachDefsByNamespace(namespaceSelector *metav1.LabelSelector) ([]*nadv1.NetworkAttachmentDefinition, error) {
+	var selectedNads []*nadv1.NetworkAttachmentDefinition
+	if namespaceSelector != nil && namespaceSelector.Size() > 0 {
+		nsSelector, err := metav1.LabelSelectorAsSelector(namespaceSelector)
+		if err != nil {
+			return nil, fmt.Errorf("invalid namespace selector %v: %v", namespaceSelector.String(), err)
+		}
+		namespaces, err := c.nqosNamespaceLister.List(nsSelector)
+		if err != nil {
+			return nil, fmt.Errorf("failed to list namespaces: %v", err)
+		}
+		for _, ns := range namespaces {
+			nads, err := c.nadLister.NetworkAttachmentDefinitions(ns.Name).List(labels.Everything())
+			if err != nil {
+				return nil, fmt.Errorf("failed to list NADs in namespace %s: %v", ns.Name, err)
+			}
+			selectedNads = append(selectedNads, nads...)
+		}
+	}
+	return selectedNads, nil
+}
+
 func (c *Controller) getNetAttachDefsBySelectors(namespaceSelector, nadSelector *metav1.LabelSelector) ([]*nadv1.NetworkAttachmentDefinition, error) {
 	if nadSelector == nil || nadSelector.Size() == 0 {
 		return nil, fmt.Errorf("empty network selector")

go-controller/pkg/ovn/controller/network_qos/network_qos_namespace.go

@@ -91,19 +91,18 @@ func namespaceMatchesNetworkSelector(namespace *corev1.Namespace, nqos *nqosv1al
 				return true
 			}
 			nsSelector = &selector.NetworkAttachmentDefinitionSelector.NamespaceSelector
-			/*case selector.PrimaryUserDefinedNetworkSelector != nil:
-				if selector.PrimaryUserDefinedNetworkSelector.NamespaceSelector.Size() == 0 {
-					// namespace selector is empty, match all
-					return true
-				}
-				nsSelector = &selector.PrimaryUserDefinedNetworkSelector.NamespaceSelector
-			case selector.SecondaryUserDefinedNetworkSelector != nil:
-				if selector.SecondaryUserDefinedNetworkSelector.NamespaceSelector.Size() == 0 {
-					// namespace selector is empty, match all
-					return true
-				}
-				nsSelector = &selector.SecondaryUserDefinedNetworkSelector.NamespaceSelector
-			*/
+		case selector.PrimaryUserDefinedNetworkSelector != nil:
+			if selector.PrimaryUserDefinedNetworkSelector.NamespaceSelector.Size() == 0 {
+				// namespace selector is empty, match all
+				return true
+			}
+			nsSelector = &selector.PrimaryUserDefinedNetworkSelector.NamespaceSelector
+		case selector.SecondaryUserDefinedNetworkSelector != nil:
+			if selector.SecondaryUserDefinedNetworkSelector.NamespaceSelector.Size() == 0 {
+				// namespace selector is empty, match all
+				return true
+			}
+			nsSelector = &selector.SecondaryUserDefinedNetworkSelector.NamespaceSelector
 		}
 		if nsSelector == nil {
 			continue
@@ -139,15 +138,14 @@ func networkSelectionChanged(nqos *nqosv1alpha1.NetworkQoS, new *corev1.Namespac
 	for _, selector := range nqos.Spec.NetworkSelectors {
 		var nsSelector *metav1.LabelSelector
 		switch selector.NetworkSelectionType {
-		/*case crdtypes.PrimaryUserDefinedNetworks:
+		case crdtypes.PrimaryUserDefinedNetworks:
 			if selector.PrimaryUserDefinedNetworkSelector != nil {
 				nsSelector = &selector.PrimaryUserDefinedNetworkSelector.NamespaceSelector
 			}
 		case crdtypes.SecondaryUserDefinedNetworks:
 			if selector.SecondaryUserDefinedNetworkSelector != nil {
 				nsSelector = &selector.SecondaryUserDefinedNetworkSelector.NamespaceSelector
 			}
-		*/
 		case crdtypes.NetworkAttachmentDefinitions:
 			if selector.NetworkAttachmentDefinitionSelector != nil {
 				nsSelector = &selector.NetworkAttachmentDefinitionSelector.NamespaceSelector