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/03/14 16:39:48 UTC
[1/2] incubator-trafficcontrol git commit: remove check for ip6 addr
and gateway in same network
Repository: incubator-trafficcontrol
Updated Branches:
refs/heads/master fec51014c -> 9f6cac310
remove check for ip6 addr and gateway in same network
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/commit/28f583c1
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/tree/28f583c1
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/diff/28f583c1
Branch: refs/heads/master
Commit: 28f583c177806f91dba890b475d1aaabadc4d0a3
Parents: fec5101
Author: Dan Kirkwood <da...@gmail.com>
Authored: Wed Feb 22 11:54:07 2017 -0700
Committer: Jeremy Mitchell <mi...@gmail.com>
Committed: Tue Mar 14 10:39:20 2017 -0600
----------------------------------------------------------------------
traffic_ops/app/lib/API/Server2.pm | 3 ---
traffic_ops/app/lib/UI/Server.pm | 3 ---
2 files changed, 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/28f583c1/traffic_ops/app/lib/API/Server2.pm
----------------------------------------------------------------------
diff --git a/traffic_ops/app/lib/API/Server2.pm b/traffic_ops/app/lib/API/Server2.pm
index 11cbcf7..7252e7f 100644
--- a/traffic_ops/app/lib/API/Server2.pm
+++ b/traffic_ops/app/lib/API/Server2.pm
@@ -217,9 +217,6 @@ sub check_server_params {
$json->{'ip6Gateway'} = $update_base->{'ip6_gateway'};
}
}
- if ( !&in_same_net( $json->{'ip6Address'}, $json->{'ip6Gateway'} ) ) {
- return ( \%params, $json->{'ip6Address'} . " and " . $json->{'ip6Gateway'} . " are not in same network" );
- }
}
my $ipstr1;
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/28f583c1/traffic_ops/app/lib/UI/Server.pm
----------------------------------------------------------------------
diff --git a/traffic_ops/app/lib/UI/Server.pm b/traffic_ops/app/lib/UI/Server.pm
index c46909f..77eb6ca 100644
--- a/traffic_ops/app/lib/UI/Server.pm
+++ b/traffic_ops/app/lib/UI/Server.pm
@@ -413,9 +413,6 @@ sub check_server_input {
if ( !&is_ip6address( $paramHashRef->{'ip6_gateway'} ) ) {
$err .= "Gateway " . $paramHashRef->{'ip6_gateway'} . " is not a valid IPv6 address " . $sep;
}
- if ( !&in_same_net( $paramHashRef->{'ip6_address'}, $paramHashRef->{'ip6_gateway'} ) ) {
- $err .= $paramHashRef->{'ip6_address'} . " and " . $paramHashRef->{'ip6_gateway'} . " are not in same network" . $sep;
- }
}
$ipstr1 = $paramHashRef->{'ilo_ip_address'} . "/" . $paramHashRef->{'ilo_ip_netmask'};
[2/2] incubator-trafficcontrol git commit: This closes #300
Posted by mi...@apache.org.
This closes #300
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/commit/9f6cac31
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/tree/9f6cac31
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/diff/9f6cac31
Branch: refs/heads/master
Commit: 9f6cac310ce5580fa5c6b3fd42a3643e863390af
Parents: 28f583c
Author: Jeremy Mitchell <mi...@gmail.com>
Authored: Tue Mar 14 10:39:43 2017 -0600
Committer: Jeremy Mitchell <mi...@gmail.com>
Committed: Tue Mar 14 10:39:43 2017 -0600
----------------------------------------------------------------------
----------------------------------------------------------------------