Merge branch 'nkfixes' into 'master'

Fixes for pool override functionality

See merge request !8

opentrafficshaper/plugins/configmanager.pm

@@ -93,6 +93,7 @@ our (@ISA,@EXPORT,@EXPORT_OK);
 	setPoolShaperState
 	unsetPoolShaperState
 	isPoolIDValid
+	isPoolOverridden
 	isPoolReady
 
 	getEffectivePool
@@ -2805,6 +2806,26 @@ sub isPoolReady
 
 
 
+# Function to check if pool is being overridden or not
+sub isPoolOverridden
+{
+	my $pid = shift;
+
+
+	if (!isPoolIDValid($pid)) {
+		return;
+	}
+
+	# Set a property based on if this pool is overridden or not
+	if (defined($globals->{'Pools'}->{$pid}->{'.applied_overrides'}) &&
+			(keys %{$globals->{'Pools'}->{$pid}->{'.applied_overrides'}}) > 0) {
+		return 1;
+	}
+
+	return 0;
+}
+
+
 # Function to return a pool with any items changed as per pool overrides
 sub getEffectivePool
 {
@@ -3353,7 +3374,7 @@ sub createLimit
 
 	my $poolName = $limitData->{'Username'};
 	my $poolData = {
-		'FriendlyName' => $limitData->{'IPAddress'},
+		'FriendlyName' => $limitData->{'FriendlyName'} || $limitData->{'IPAddress'},
 		'Name' => $poolName,
 		'InterfaceGroupID' => $limitData->{'InterfaceGroupID'},
 		'TrafficClassID' => $limitData->{'TrafficClassID'},
@@ -3404,7 +3425,10 @@ sub createPoolOverride
 	# Check that we have at least one match attribute
 	my $isValid = 0;
 	foreach my $item (POOL_OVERRIDE_MATCH_ATTRIBUTES) {
-		$isValid++;
+		# Bump up $isValid if we have a match attribute
+		if (defined($poolOverrideData->{$item})) {
+			$isValid++;
+		}
 	}
 	if (!$isValid) {
 		$logger->log(LOG_WARN,"[CONFIGMANAGER] Cannot process pool override as there is no selection attribute");
@@ -3623,14 +3647,15 @@ sub _resolve_pool_override
 
 			# Loop with the attributes and check for a full match
 			foreach my $attr (POOL_OVERRIDE_MATCH_ATTRIBUTES) {
-
 				# If this attribute in the pool override is set, then lets check it
 				if (defined($poolOverride->{$attr}) && $poolOverride->{$attr} ne "") {
-					# Check for match or mismatch
-					if (defined($candidate->{$attr}) && $candidate->{$attr} eq $poolOverride->{$attr}) {
-						$numMatches++;
-					} else {
-						$numMismatches++;
+					# Check for match or mismatch, only if candidate attribute is defined
+					if (defined($candidate->{$attr})) {
+						if ($candidate->{$attr} eq $poolOverride->{$attr}) {
+							$numMatches++;
+						} else {
+							$numMismatches++;
+						}
 					}
 				}
 			}

opentrafficshaper/plugins/tc/tc.pm

@@ -315,7 +315,7 @@ sub _session_pool_add
 	# Grab pool
 	my $pool;
 	if (!defined($pool = getPool($pid))) {
-		$logger->log(LOG_ERR,"[TC] Shaper 'remove' event with non existing pool '%s'",$pid);
+		$logger->log(LOG_ERR,"[TC] Shaper 'add' event with non existing pool '%s'",$pid);
 		return;
 	}
 

opentrafficshaper/plugins/webserver/pages/limits.pm

@@ -59,6 +59,7 @@ use opentrafficshaper::plugins::configmanager qw(
 	getPool
 	getPoolByName
 	getPoolShaperState
+	isPoolOverridden
 	isPoolReady
 
 	getPoolMembers
@@ -213,9 +214,9 @@ EOF
 #		if ($pool->{'Status'} eq 'conflict') {
 #			$icons .= '<span class="glyphicon glyphicon-random" />';
 #		}
-#		if ($pool->{'Status'} eq 'conflict') {
-#			$icons .= '<span class="glyphicon glyphicon-edit" />';
-#		}
+		if (isPoolOverridden($pool->{'ID'})) {
+			$icons .= '<span class="glyphicon glyphicon-edit" />';
+		}
 
 		my $urlStatsPool = sprintf('/statistics/by-pool?pool=%s',uri_escape("$pool->{'InterfaceGroupID'}:$pool->{'Name'}"));
 		my $urlPoolEdit = sprintf('/limits/pool-edit?pid=%s',uri_escape($pool->{'ID'}));
@@ -2010,12 +2011,31 @@ sub pool_override_addedit
 			push(@errors,"Friendly name must be specified");
 		}
 
-		# Make sure we have at least a pool name, username or IP address
-		my $poolName = isUsername($formData->{'PoolName'},ISUSERNAME_ALLOW_ATSIGN);
-		my $username = isUsername($formData->{'Username'},ISUSERNAME_ALLOW_ATSIGN);
-		my $ipAddress = isIPv4($formData->{'IPAddress'});
+		# Check the pool name is valid if it was specified
+		my $poolName;
+		if (defined($formData->{'PoolName'}) && $formData->{'PoolName'} ne "") {
+			if (!defined($poolName = isUsername($formData->{'PoolName'},ISUSERNAME_ALLOW_ATSIGN))) {
+				push(@errors,"Pool name is not valid");
+			}
+		}
+		# Next check the username
+		my $username;
+		if (defined($formData->{'Username'}) && $formData->{'Username'} ne "") {
+			if (!defined($username = isUsername($formData->{'Username'},ISUSERNAME_ALLOW_ATSIGN))) {
+				push(@errors,"Username is not valid");
+			}
+		}
+		# Then the IP
+		my $ipAddress;
+		if (defined($formData->{'IPAddress'}) && $formData->{'IPAddress'} ne "") {
+			if (!defined($ipAddress = isIPv4($formData->{'IPAddress'}))) {
+				push(@errors,"IP address is not valid");
+			}
+		}
+
+		# Then confirm we have at least one of the above
 		if (!defined($poolName) && !defined($username) && !defined($ipAddress)) {
-			push(@errors,"A pool name and/or IP address and/or Username must be specified");
+			push(@errors,"At least a valid pool name, username or IP address must be specified to match");
 		}
 
 		# If the traffic class is ticked, process it
@@ -2057,7 +2077,7 @@ sub pool_override_addedit
 				!defined($txCIR) && !defined($txLimit) &&
 				!defined($rxCIR) && !defined($rxLimit)
 		) {
-			push(@errors,"Something must be specified to pool override");
+			push(@errors,"Something must be specified to override");
 		}
 
 		my $expires = 0;