You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficcontrol.apache.org by mi...@apache.org on 2017/04/06 21:09:20 UTC
[1/3] incubator-trafficcontrol git commit: Fix failure in
t_integration/server.t by translating a profile name to id if needed
Repository: incubator-trafficcontrol
Updated Branches:
refs/heads/master d34fb3303 -> bf2f8a63b
Fix failure in t_integration/server.t by translating a profile name to id if needed
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/commit/b8b7a51c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/tree/b8b7a51c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/diff/b8b7a51c
Branch: refs/heads/master
Commit: b8b7a51cb773daff0db2610c19f6f793b5e8788b
Parents: 8c5ac3b
Author: nir-sopher <ni...@gmail.com>
Authored: Thu Mar 16 15:07:45 2017 +0200
Committer: Jeremy Mitchell <mi...@gmail.com>
Committed: Thu Apr 6 15:09:16 2017 -0600
----------------------------------------------------------------------
traffic_ops/app/lib/UI/UploadHandlerCsv.pm | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/b8b7a51c/traffic_ops/app/lib/UI/UploadHandlerCsv.pm
----------------------------------------------------------------------
diff --git a/traffic_ops/app/lib/UI/UploadHandlerCsv.pm b/traffic_ops/app/lib/UI/UploadHandlerCsv.pm
index b34d1fe..139b24a 100644
--- a/traffic_ops/app/lib/UI/UploadHandlerCsv.pm
+++ b/traffic_ops/app/lib/UI/UploadHandlerCsv.pm
@@ -406,10 +406,10 @@ sub replaceNamedLookupValues {
$paramHashRef->{'type'} = $typeHashRef->{ $paramHashRef->{'type'} };
# }
- # if ($paramHashRef->{'profile'} !~ /^[+-]?\d+$/) {
- $paramHashRef->{'profile'} = $profileHashRef->{ $paramHashRef->{'profile'} };
+ if ($paramHashRef->{'profile'} !~ /^[+-]?\d+$/) {
+ $paramHashRef->{'profile'} = $profileHashRef->{ $paramHashRef->{'profile'} };
- # }
+ }
# if ($paramHashRef->{'phys_location'} !~ /^[+-]?\d+$/) {
$paramHashRef->{'phys_location'} = $physLocationHashRef->{ $paramHashRef->{'phys_location'} };
[2/3] incubator-trafficcontrol git commit: Fix failure in
t_integration/server.t by adding a replaceNamedLookupValues before
check_server_input call
Posted by mi...@apache.org.
Fix failure in t_integration/server.t by adding a replaceNamedLookupValues before check_server_input call
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/commit/8c5ac3b5
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/tree/8c5ac3b5
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/diff/8c5ac3b5
Branch: refs/heads/master
Commit: 8c5ac3b52626b5824ecae3965df1d3bc3bd5194b
Parents: d34fb33
Author: nir-sopher <ni...@gmail.com>
Authored: Thu Mar 16 14:55:12 2017 +0200
Committer: Jeremy Mitchell <mi...@gmail.com>
Committed: Thu Apr 6 15:09:16 2017 -0600
----------------------------------------------------------------------
traffic_ops/app/lib/UI/UploadHandlerCsv.pm | 2 ++
1 file changed, 2 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/8c5ac3b5/traffic_ops/app/lib/UI/UploadHandlerCsv.pm
----------------------------------------------------------------------
diff --git a/traffic_ops/app/lib/UI/UploadHandlerCsv.pm b/traffic_ops/app/lib/UI/UploadHandlerCsv.pm
index d3c7568..b34d1fe 100644
--- a/traffic_ops/app/lib/UI/UploadHandlerCsv.pm
+++ b/traffic_ops/app/lib/UI/UploadHandlerCsv.pm
@@ -326,6 +326,7 @@ sub processCSV {
}
else {
my $paramHashRef = &getParamHashRef( \@p, $lineNumber );
+ $paramHashRef = &replaceNamedLookupValues( $paramHashRef, $cdnHashRef, $cachegroupHashRef, $typeHashRef, $profileHashRef, $physLocationHashRef );
# print Dumper($paramHashRef);
$processCSVErrors .= &UI::Server::check_server_input( $self, $paramHashRef );
@@ -366,6 +367,7 @@ sub processCSV {
}
else {
my $paramHashRef = &getParamHashRef( \@p, $lineNumber );
+ $paramHashRef = &replaceNamedLookupValues( $paramHashRef, $cdnHashRef, $cachegroupHashRef, $typeHashRef, $profileHashRef, $physLocationHashRef );
$processCSVErrors .= &UI::Server::check_server_input( $self, $paramHashRef );
my $enteredCdn = $p[9];
my $enteredCachegroup = $p[10];
[3/3] incubator-trafficcontrol git commit: This closes #377
Posted by mi...@apache.org.
This closes #377
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/commit/bf2f8a63
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/tree/bf2f8a63
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/diff/bf2f8a63
Branch: refs/heads/master
Commit: bf2f8a63b08e0e0108816cb448b6ff56ee6414a9
Parents: b8b7a51
Author: Jeremy Mitchell <mi...@gmail.com>
Authored: Thu Apr 6 15:09:37 2017 -0600
Committer: Jeremy Mitchell <mi...@gmail.com>
Committed: Thu Apr 6 15:09:37 2017 -0600
----------------------------------------------------------------------
----------------------------------------------------------------------