You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafficcontrol.apache.org by da...@apache.org on 2016/11/21 19:05:17 UTC

[02/40] incubator-trafficcontrol git commit: fixed the data alignment

fixed the data alignment


Project: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/commit/3f806916
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/tree/3f806916
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/diff/3f806916

Branch: refs/heads/psql-rebase
Commit: 3f8069168171460f6a1b47c54a2800ddb35b79a2
Parents: d8a0ad0
Author: Dewayne Richardson <de...@apache.org>
Authored: Thu Nov 17 14:01:05 2016 -0700
Committer: Dan Kirkwood <da...@gmail.com>
Committed: Mon Nov 21 12:04:09 2016 -0700

----------------------------------------------------------------------
 traffic_ops/app/t/api/1.1/server.t | 36 ++++++++++++++++-----------------
 1 file changed, 18 insertions(+), 18 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/3f806916/traffic_ops/app/t/api/1.1/server.t
----------------------------------------------------------------------
diff --git a/traffic_ops/app/t/api/1.1/server.t b/traffic_ops/app/t/api/1.1/server.t
index a1c0341..5aae814 100644
--- a/traffic_ops/app/t/api/1.1/server.t
+++ b/traffic_ops/app/t/api/1.1/server.t
@@ -39,32 +39,32 @@ ok $t->post_ok( '/login', => form => { u => Test::TestHelper::ADMIN_USER, p => T
 	->or( sub { diag $t->tx->res->content->asset->{content}; } );
 
 $t->get_ok('/api/1.1/servers.json?orderby=id')->status_is(200)->or( sub { diag $t->tx->res->content->asset->{content}; } )
-	->json_is( "/response/1/status", "ONLINE" )->json_is( "/response/1/ipGateway", "127.0.0.7" )->json_is( "/response/1/ip6Gateway", "2345:1234:12:d::1" )
-	->json_is( "/response/1/tcpPort", "80" )->json_is( "/response/1/cachegroup", "edge_atl_group" )
-	->json_is( "/response/1/hostName", "atlanta-edge-02" )->json_is( "/response/1/domainName", "ga.atlanta.kabletown.net" )
-	->json_is( "/response/1/ipAddress", "127.0.0.7" )->json_is( "/response/1/profile", "EDGE1" )->json_is( "/response/1/type", "EDGE" )
-	->json_is( "/response/1/physLocation", "Boulder" )->json_is( "/response/1/interfaceName", "bond0" )->json_is( "/response/1/interfaceMtu", "9000" )
+	->json_is( "/response/1/status", "ONLINE" )->json_is( "/response/1/ipGateway", "127.0.0.2" )->json_is( "/response/1/ip6Gateway", "2345:1234:12:9::1" )
+	->json_is( "/response/1/tcpPort", "80" )->json_is( "/response/1/cachegroup", "mid-northeast-group" )
+	->json_is( "/response/1/hostName", "atlanta-mid-01" )->json_is( "/response/1/domainName", "ga.atlanta.kabletown.net" )
+	->json_is( "/response/1/ipAddress", "127.0.0.2" )->json_is( "/response/1/profile", "MID1" )->json_is( "/response/1/type", "MID" )
+	->json_is( "/response/1/physLocation", "Denver" )->json_is( "/response/1/interfaceName", "bond0" )->json_is( "/response/1/interfaceMtu", "9000" )
 
-	->json_is( "/response/2/status", "ONLINE" )->json_is( "/response/2/ipGateway", "127.0.0.1" )->json_is( "/response/2/ip6Gateway", "2345:1234:12:8::1" )
-	->json_is( "/response/2/tcpPort", "80" )->json_is( "/response/2/cachegroup", "edge_atl_group" )->json_is( "/response/2/hostName", "atlanta-edge-03" )
-	->json_is( "/response/2/domainName", "ga.atlanta.kabletown.net" )->json_is( "/response/2/ipAddress", "127.0.0.13" )->json_is( "/response/2/profile", "EDGE1" )
-	->json_is( "/response/2/type", "EDGE" )->json_is( "/response/2/physLocation", "Boulder" )->json_is( "/response/2/interfaceName", "bond0" )
+	->json_is( "/response/2/status", "ONLINE" )->json_is( "/response/2/ipGateway", "127.0.0.4" )->json_is( "/response/2/ip6Gateway", "2345:1234:12:b::1" )
+	->json_is( "/response/2/tcpPort", "81" )->json_is( "/response/2/cachegroup", "mid-northeast-group" )->json_is( "/response/2/hostName", "rascal01" )
+	->json_is( "/response/2/domainName", "kabletown.net" )->json_is( "/response/2/ipAddress", "127.0.0.4" )->json_is( "/response/2/profile", "CCR1" )
+	->json_is( "/response/2/type", "CCR" )->json_is( "/response/2/physLocation", "Denver" )->json_is( "/response/2/interfaceName", "bond0" )
 	->json_is( "/response/2/interfaceMtu", "9000" )
 
-	->json_is( "/response/4/status", "ONLINE" )->json_is( "/response/4/ipGateway", "127.0.0.8" )->json_is( "/response/4/ip6Gateway", "2345:1234:12:e::1" )
-	->json_is( "/response/4/tcpPort", "80" )->json_is( "/response/4/cachegroup", "mid-northwest-group" )->json_is( "/response/4/hostName", "atlanta-mid-02" )
-	->json_is( "/response/4/domainName", "ga.atlanta.kabletown.net" )->json_is( "/response/4/ipAddress", "127.0.0.8" )->json_is( "/response/4/profile", "MID1" )
-	->json_is( "/response/4/type", "MID" )->json_is( "/response/4/physLocation", "Denver" )->json_is( "/response/4/interfaceName", "bond0" )
+	->json_is( "/response/4/status", "ONLINE" )->json_is( "/response/4/ipGateway", "127.0.0.6" )->json_is( "/response/4/ip6Gateway", "2345:1234:12:c::1" )
+	->json_is( "/response/4/tcpPort", "81" )->json_is( "/response/4/cachegroup", "mid-northeast-group" )->json_is( "/response/4/hostName", "rascal02" )
+	->json_is( "/response/4/domainName", "kabletown.net" )->json_is( "/response/4/ipAddress", "127.0.0.6" )->json_is( "/response/4/profile", "CCR1" )
+	->json_is( "/response/4/type", "CCR" )->json_is( "/response/4/physLocation", "Denver" )->json_is( "/response/4/interfaceName", "bond0" )
 	->json_is( "/response/4/interfaceMtu", "9000" )
 
-	->json_is( "/response/7/status", "ONLINE" )->json_is( "/response/7/ipGateway", "127.0.0.11" )->json_is( "/response/7/ip6Gateway", "127.0.0.11" )
-	->json_is( "/response/7/tcpPort", "8086" )->json_is( "/response/7/cachegroup", "mid-northeast-group" )->json_is( "/response/7/hostName", "influxdb02" )
-	->json_is( "/response/7/domainName", "kabletown.net" )->json_is( "/response/7/ipAddress", "127.0.0.11" )->json_is( "/response/7/profile", "RASCAL1" )
-	->json_is( "/response/7/type", "INFLUXDB" )->json_is( "/response/7/physLocation", "HotAtlanta" )->json_is( "/response/7/interfaceName", "eth1" )
+	->json_is( "/response/7/status", "ONLINE" )->json_is( "/response/7/ipGateway", "127.0.0.9" )->json_is( "/response/7/ip6Gateway", "2345:1234:12:f::1" )
+	->json_is( "/response/7/tcpPort", "8088" )->json_is( "/response/7/cachegroup", "mid-northeast-group" )->json_is( "/response/7/hostName", "riak02" )
+	->json_is( "/response/7/domainName", "kabletown.net" )->json_is( "/response/7/ipAddress", "127.0.0.9" )->json_is( "/response/7/profile", "RIAK1" )
+	->json_is( "/response/7/type", "RIAK" )->json_is( "/response/7/physLocation", "Boulder" )->json_is( "/response/7/interfaceName", "eth1" )
 	->json_is( "/response/7/interfaceMtu", "1500" );
 
 $t->get_ok('/api/1.1/servers/hostname/atlanta-edge-01/details.json')->status_is(200)->or( sub { diag $t->tx->res->content->asset->{content}; } )
-	->json_is( "/response/ipGateway", "127.0.0.1" )->json_is( "/response/deliveryservices/0", "8" );
+	->json_is( "/response/ipGateway", "127.0.0.1" )->json_is( "/response/deliveryservices/0", "100" );
 
 ok $t->get_ok('/logout')->status_is(302)->or( sub { diag $t->tx->res->content->asset->{content}; } );
 $dbh->disconnect();