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/01/10 03:39:00 UTC
[48/50] incubator-trafficcontrol git commit: fixes fixture ids (makes
them high so they don't clash with creates done directly to the api) and
fixes some broken tests
fixes fixture ids (makes them high so they don't clash with creates done directly to the api) and fixes some broken tests
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/commit/496bcab5
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/tree/496bcab5
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/diff/496bcab5
Branch: refs/heads/master
Commit: 496bcab5068aef26280c5f90993042be0c9df853
Parents: 5fe789b
Author: Jeremy Mitchell <mi...@gmail.com>
Authored: Mon Jan 9 15:28:21 2017 -0700
Committer: Dan Kirkwood <da...@gmail.com>
Committed: Mon Jan 9 15:40:24 2017 -0700
----------------------------------------------------------------------
traffic_ops/app/lib/Fixtures/Asn.pm | 8 +--
traffic_ops/app/lib/Fixtures/Cachegroup.pm | 12 ++--
.../app/lib/Fixtures/CachegroupParameter.pm | 8 +--
traffic_ops/app/lib/Fixtures/Cdn.pm | 4 +-
traffic_ops/app/lib/Fixtures/Deliveryservice.pm | 26 ++++----
traffic_ops/app/lib/Fixtures/Division.pm | 2 +-
traffic_ops/app/lib/Fixtures/EdgeCachegroup.pm | 6 +-
traffic_ops/app/lib/Fixtures/PhysLocation.pm | 6 +-
traffic_ops/app/lib/Fixtures/Region.pm | 8 +--
traffic_ops/app/lib/Fixtures/Server.pm | 60 +++++++++---------
traffic_ops/app/lib/Fixtures/Staticdnsentry.pm | 6 +-
traffic_ops/app/t/api/1.1/asn.t | 12 ++--
traffic_ops/app/t/api/1.2/asn.t | 22 +++----
traffic_ops/app/t/api/1.2/cdn.t | 10 ++-
.../app/t/api/1.2/deliveryservice_server.t | 16 ++---
traffic_ops/app/t/api/1.2/division.t | 13 ++--
traffic_ops/app/t/api/1.2/physlocation.t | 8 +--
traffic_ops/app/t/api/1.2/region.t | 20 +++---
traffic_ops/app/t/api/1.2/server.t | 66 +++++++-------------
traffic_ops/app/t/deliveryservice.t | 8 +--
traffic_ops/app/t/phys_location.t | 6 +-
traffic_ops/app/t/server.t | 8 +--
22 files changed, 155 insertions(+), 180 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/496bcab5/traffic_ops/app/lib/Fixtures/Asn.pm
----------------------------------------------------------------------
diff --git a/traffic_ops/app/lib/Fixtures/Asn.pm b/traffic_ops/app/lib/Fixtures/Asn.pm
index b2f5e07..e274cf4 100644
--- a/traffic_ops/app/lib/Fixtures/Asn.pm
+++ b/traffic_ops/app/lib/Fixtures/Asn.pm
@@ -22,17 +22,17 @@ my %definition_for = (
test_cran_1 => {
new => 'Asn',
using => {
- id => 1,
+ id => 100,
asn => 9939,
- cachegroup => 1,
+ cachegroup => 100,
},
},
test_cran_2 => {
new => 'Asn',
using => {
- id => 2,
+ id => 200,
asn => 9940,
- cachegroup => 2,
+ cachegroup => 200,
},
},
);
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/496bcab5/traffic_ops/app/lib/Fixtures/Cachegroup.pm
----------------------------------------------------------------------
diff --git a/traffic_ops/app/lib/Fixtures/Cachegroup.pm b/traffic_ops/app/lib/Fixtures/Cachegroup.pm
index ad0e919..8592c56 100644
--- a/traffic_ops/app/lib/Fixtures/Cachegroup.pm
+++ b/traffic_ops/app/lib/Fixtures/Cachegroup.pm
@@ -21,7 +21,7 @@ my %definition_for = (
mid_northeast => {
new => 'Cachegroup',
using => {
- id => 1,
+ id => 100,
name => 'mid-northeast-group',
short_name => 'ne',
type => 2,
@@ -33,19 +33,19 @@ my %definition_for = (
mid_northwest => {
new => 'Cachegroup',
using => {
- id => 2,
+ id => 200,
name => 'mid-northwest-group',
short_name => 'nw',
type => 2,
latitude => 100,
longitude => 100,
- parent_cachegroup_id => 1,
+ parent_cachegroup_id => 100,
},
},
mid_cg3 => {
new => 'Cachegroup',
using => {
- id => 8,
+ id => 800,
name => 'mid_cg3',
short_name => 'mid_cg3',
type => 6,
@@ -57,13 +57,13 @@ my %definition_for = (
edge_cg4 => {
new => 'Cachegroup',
using => {
- id => 9,
+ id => 900,
name => 'edge_cg4',
short_name => 'edge_cg4',
type => 5,
latitude => 100,
longitude => 100,
- parent_cachegroup_id => 8,
+ parent_cachegroup_id => 800,
},
},
);
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/496bcab5/traffic_ops/app/lib/Fixtures/CachegroupParameter.pm
----------------------------------------------------------------------
diff --git a/traffic_ops/app/lib/Fixtures/CachegroupParameter.pm b/traffic_ops/app/lib/Fixtures/CachegroupParameter.pm
index 3db65d0..3e01378 100644
--- a/traffic_ops/app/lib/Fixtures/CachegroupParameter.pm
+++ b/traffic_ops/app/lib/Fixtures/CachegroupParameter.pm
@@ -21,28 +21,28 @@ my %definition_for = (
cachegroupparameter1 => {
new => 'CachegroupParameter',
using => {
- cachegroup => 1,
+ cachegroup => 100,
parameter => 60,
},
},
cachegroupparameter2 => {
new => 'CachegroupParameter',
using => {
- cachegroup => 1,
+ cachegroup => 100,
parameter => 61,
},
},
cachegroupparameter3 => {
new => 'CachegroupParameter',
using => {
- cachegroup => 2,
+ cachegroup => 200,
parameter => 60,
},
},
cachegroupparameter4 => {
new => 'CachegroupParameter',
using => {
- cachegroup => 2,
+ cachegroup => 200,
parameter => 61,
},
},
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/496bcab5/traffic_ops/app/lib/Fixtures/Cdn.pm
----------------------------------------------------------------------
diff --git a/traffic_ops/app/lib/Fixtures/Cdn.pm b/traffic_ops/app/lib/Fixtures/Cdn.pm
index dacb604..4ca30b4 100644
--- a/traffic_ops/app/lib/Fixtures/Cdn.pm
+++ b/traffic_ops/app/lib/Fixtures/Cdn.pm
@@ -23,7 +23,7 @@ my %definition_for = (
cdn1_cdn_name => {
new => 'Cdn',
using => {
- id => 1,
+ id => 100,
name => 'cdn1',
},
},
@@ -31,7 +31,7 @@ my %definition_for = (
cdn2_cdn_name => {
new => 'Cdn',
using => {
- id => 2,
+ id => 200,
name => 'cdn2',
},
},
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/496bcab5/traffic_ops/app/lib/Fixtures/Deliveryservice.pm
----------------------------------------------------------------------
diff --git a/traffic_ops/app/lib/Fixtures/Deliveryservice.pm b/traffic_ops/app/lib/Fixtures/Deliveryservice.pm
index 290c211..28953d0 100644
--- a/traffic_ops/app/lib/Fixtures/Deliveryservice.pm
+++ b/traffic_ops/app/lib/Fixtures/Deliveryservice.pm
@@ -48,7 +48,7 @@ my %definition_for = (
check_path => '/crossdomain.xml',
type => 21,
profile => 100,
- cdn_id => 1,
+ cdn_id => 100,
ipv6_routing_enabled => 1,
protocol => 1,
display_name => 'test-ds1-displayname',
@@ -86,7 +86,7 @@ my %definition_for = (
check_path => '/crossdomain.xml',
type => 9,
profile => 100,
- cdn_id => 1,
+ cdn_id => 100,
display_name => 'test-ds2-displayname',
initial_dispersion => 1,
geo_provider => 0,
@@ -124,7 +124,7 @@ my %definition_for = (
check_path => '/crossdomain.xml',
type => 9,
profile => 100,
- cdn_id => 1,
+ cdn_id => 100,
display_name => 'test-ds3-displayname',
initial_dispersion => 1,
geo_provider => 0,
@@ -162,7 +162,7 @@ my %definition_for = (
check_path => '/crossdomain.xml',
type => 9,
profile => 100,
- cdn_id => 1,
+ cdn_id => 100,
display_name => 'test-ds4-displayname',
initial_dispersion => 1,
geo_provider => 0,
@@ -200,7 +200,7 @@ my %definition_for = (
check_path => '/crossdomain.xml',
type => 7,
profile => 300,
- cdn_id => 1,
+ cdn_id => 100,
display_name => 'test-ds5-displayname',
initial_dispersion => 1,
geo_provider => 0,
@@ -238,7 +238,7 @@ my %definition_for = (
check_path => '/crossdomain.xml',
type => 9,
profile => 300,
- cdn_id => 1,
+ cdn_id => 100,
display_name => 'test-ds6-displayname',
initial_dispersion => 1,
geo_provider => 0,
@@ -275,7 +275,7 @@ my %definition_for = (
check_path => '/crossdomain.xml',
type => 21,
profile => 100,
- cdn_id => 1,
+ cdn_id => 100,
ipv6_routing_enabled => 1,
protocol => 1,
display_name => 'steering-ds1-displayname',
@@ -311,7 +311,7 @@ my %definition_for = (
check_path => '/crossdomain.xml',
type => 21,
profile => 100,
- cdn_id => 1,
+ cdn_id => 100,
ipv6_routing_enabled => 1,
protocol => 1,
display_name => 'steering-ds2-displayname',
@@ -347,7 +347,7 @@ my %definition_for = (
check_path => '/crossdomain.xml',
type => 21,
profile => 100,
- cdn_id => 1,
+ cdn_id => 100,
ipv6_routing_enabled => 1,
protocol => 1,
display_name => 'new-steering-ds-displayname',
@@ -383,7 +383,7 @@ my %definition_for = (
check_path => '/crossdomain.xml',
type => 21,
profile => 100,
- cdn_id => 1,
+ cdn_id => 100,
ipv6_routing_enabled => 1,
protocol => 1,
display_name => 'target-ds1-displayname',
@@ -419,7 +419,7 @@ my %definition_for = (
check_path => '/crossdomain.xml',
type => 21,
profile => 100,
- cdn_id => 1,
+ cdn_id => 100,
ipv6_routing_enabled => 1,
protocol => 1,
display_name => 'target-ds2-displayname',
@@ -455,7 +455,7 @@ my %definition_for = (
check_path => '/crossdomain.xml',
type => 21,
profile => 100,
- cdn_id => 1,
+ cdn_id => 100,
ipv6_routing_enabled => 1,
protocol => 1,
display_name => 'target-ds3-displayname',
@@ -491,7 +491,7 @@ my %definition_for = (
check_path => '/crossdomain.xml',
type => 21,
profile => 100,
- cdn_id => 1,
+ cdn_id => 100,
ipv6_routing_enabled => 1,
protocol => 1,
display_name => 'target-ds4-displayname',
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/496bcab5/traffic_ops/app/lib/Fixtures/Division.pm
----------------------------------------------------------------------
diff --git a/traffic_ops/app/lib/Fixtures/Division.pm b/traffic_ops/app/lib/Fixtures/Division.pm
index 5a1f8d5..6e35f7f 100644
--- a/traffic_ops/app/lib/Fixtures/Division.pm
+++ b/traffic_ops/app/lib/Fixtures/Division.pm
@@ -22,7 +22,7 @@ my %definition_for = (
mountain => {
new => 'Division',
using => {
- id => 1,
+ id => 100,
name => 'mountain',
},
},
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/496bcab5/traffic_ops/app/lib/Fixtures/EdgeCachegroup.pm
----------------------------------------------------------------------
diff --git a/traffic_ops/app/lib/Fixtures/EdgeCachegroup.pm b/traffic_ops/app/lib/Fixtures/EdgeCachegroup.pm
index 371c015..dc7ef00 100644
--- a/traffic_ops/app/lib/Fixtures/EdgeCachegroup.pm
+++ b/traffic_ops/app/lib/Fixtures/EdgeCachegroup.pm
@@ -21,14 +21,14 @@ my %definition_for = (
edge_atl => {
new => 'Cachegroup',
using => {
- id => 3,
+ id => 300,
name => 'edge_atl_group',
short_name => 'atl',
type => 5,
latitude => 120,
longitude => 120,
- parent_cachegroup_id => 1,
- secondary_parent_cachegroup_id => 2,
+ parent_cachegroup_id => 100,
+ secondary_parent_cachegroup_id => 200,
},
},
);
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/496bcab5/traffic_ops/app/lib/Fixtures/PhysLocation.pm
----------------------------------------------------------------------
diff --git a/traffic_ops/app/lib/Fixtures/PhysLocation.pm b/traffic_ops/app/lib/Fixtures/PhysLocation.pm
index 914c9e4..c823185 100644
--- a/traffic_ops/app/lib/Fixtures/PhysLocation.pm
+++ b/traffic_ops/app/lib/Fixtures/PhysLocation.pm
@@ -32,7 +32,7 @@ my %definition_for = (
phone => '303-111-1111',
email => undef,
comments => undef,
- region => 1,
+ region => 100,
},
},
boulder => {
@@ -49,7 +49,7 @@ my %definition_for = (
phone => '303-222-2222',
email => undef,
comments => undef,
- region => 1,
+ region => 100,
},
},
atlanta => {
@@ -66,7 +66,7 @@ my %definition_for = (
phone => '404-222-2222',
email => undef,
comments => undef,
- region => 1,
+ region => 100,
},
},
);
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/496bcab5/traffic_ops/app/lib/Fixtures/Region.pm
----------------------------------------------------------------------
diff --git a/traffic_ops/app/lib/Fixtures/Region.pm b/traffic_ops/app/lib/Fixtures/Region.pm
index cecf71c..85a6523 100644
--- a/traffic_ops/app/lib/Fixtures/Region.pm
+++ b/traffic_ops/app/lib/Fixtures/Region.pm
@@ -21,17 +21,17 @@ my %definition_for = (
mile_high => {
new => 'Region',
using => {
- id => 1,
+ id => 100,
name => 'Denver Region',
- division => 1,
+ division => 100,
},
},
boulder => {
new => 'Region',
using => {
- id => 2,
+ id => 200,
name => 'Boulder Region',
- division => 1,
+ division => 100,
},
},
);
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/496bcab5/traffic_ops/app/lib/Fixtures/Server.pm
----------------------------------------------------------------------
diff --git a/traffic_ops/app/lib/Fixtures/Server.pm b/traffic_ops/app/lib/Fixtures/Server.pm
index cf0e5d5..a52ae69 100644
--- a/traffic_ops/app/lib/Fixtures/Server.pm
+++ b/traffic_ops/app/lib/Fixtures/Server.pm
@@ -48,8 +48,8 @@ my %definition_for = (
type => 1,
status => 2,
profile => 100,
- cdn_id => 1,
- cachegroup => 3,
+ cdn_id => 100,
+ cachegroup => 300,
phys_location => 100,
},
},
@@ -83,8 +83,8 @@ my %definition_for = (
type => 2,
status => 2,
profile => 200,
- cdn_id => 1,
- cachegroup => 1,
+ cdn_id => 100,
+ cachegroup => 100,
phys_location => 100,
},
},
@@ -118,8 +118,8 @@ my %definition_for = (
type => 4,
status => 2,
profile => 300,
- cdn_id => 2,
- cachegroup => 1,
+ cdn_id => 200,
+ cachegroup => 100,
phys_location => 100,
},
},
@@ -153,8 +153,8 @@ my %definition_for = (
type => 31,
status => 2,
profile => 500,
- cdn_id => 1,
- cachegroup => 1,
+ cdn_id => 100,
+ cachegroup => 100,
phys_location => 100,
},
},
@@ -188,8 +188,8 @@ my %definition_for = (
type => 4,
status => 2,
profile => 300,
- cdn_id => 2,
- cachegroup => 1,
+ cdn_id => 200,
+ cachegroup => 100,
phys_location => 100,
},
},
@@ -223,8 +223,8 @@ my %definition_for = (
type => 1,
status => 2,
profile => 100,
- cdn_id => 1,
- cachegroup => 3,
+ cdn_id => 100,
+ cachegroup => 300,
phys_location => 100,
},
},
@@ -258,8 +258,8 @@ my %definition_for = (
type => 2,
status => 2,
profile => 200,
- cdn_id => 2,
- cachegroup => 2,
+ cdn_id => 200,
+ cachegroup => 200,
phys_location => 200,
},
},
@@ -293,8 +293,8 @@ my %definition_for = (
type => 31,
status => 2,
profile => 500,
- cdn_id => 1,
- cachegroup => 1,
+ cdn_id => 100,
+ cachegroup => 100,
phys_location => 200,
},
},
@@ -328,8 +328,8 @@ my %definition_for = (
type => 32,
status => 2,
profile => 500,
- cdn_id => 1,
- cachegroup => 1,
+ cdn_id => 100,
+ cachegroup => 100,
phys_location => 300,
},
},
@@ -363,8 +363,8 @@ my %definition_for = (
type => 32,
status => 2,
profile => 500,
- cdn_id => 1,
- cachegroup => 1,
+ cdn_id => 100,
+ cachegroup => 100,
phys_location => 300,
},
},
@@ -398,8 +398,8 @@ my %definition_for = (
type => 4,
status => 2,
profile => 100,
- cdn_id => 1,
- cachegroup => 3,
+ cdn_id => 100,
+ cachegroup => 300,
phys_location => 100,
},
},
@@ -433,8 +433,8 @@ my %definition_for = (
type => 1,
status => 3,
profile => 100,
- cdn_id => 1,
- cachegroup => 3,
+ cdn_id => 100,
+ cachegroup => 300,
phys_location => 100,
},
},
@@ -468,8 +468,8 @@ my %definition_for = (
type => 1,
status => 2,
profile => 100,
- cdn_id => 1,
- cachegroup => 9,
+ cdn_id => 100,
+ cachegroup => 900,
phys_location => 100,
},
},
@@ -503,8 +503,8 @@ my %definition_for = (
type => 1,
status => 2,
profile => 100,
- cdn_id => 1,
- cachegroup => 9,
+ cdn_id => 100,
+ cachegroup => 900,
phys_location => 100,
},
},
@@ -538,8 +538,8 @@ my %definition_for = (
type => 2,
status => 2,
profile => 100,
- cdn_id => 1,
- cachegroup => 8,
+ cdn_id => 100,
+ cachegroup => 800,
phys_location => 100,
},
},
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/496bcab5/traffic_ops/app/lib/Fixtures/Staticdnsentry.pm
----------------------------------------------------------------------
diff --git a/traffic_ops/app/lib/Fixtures/Staticdnsentry.pm b/traffic_ops/app/lib/Fixtures/Staticdnsentry.pm
index 8da2a8e..41342f5 100644
--- a/traffic_ops/app/lib/Fixtures/Staticdnsentry.pm
+++ b/traffic_ops/app/lib/Fixtures/Staticdnsentry.pm
@@ -26,7 +26,7 @@ my %definition_for = (
address => '127.0.0.1',
type => 21,
deliveryservice => 100,
- cachegroup => 1,
+ cachegroup => 100,
},
},
aaaa_record_host => {
@@ -36,7 +36,7 @@ my %definition_for = (
host => 'AAAA_RECORD_HOST',
address => '127.0.0.1',
deliveryservice => 100,
- cachegroup => 1,
+ cachegroup => 100,
type => 22,
},
},
@@ -48,7 +48,7 @@ my %definition_for = (
address => '127.0.0.1',
deliveryservice => 200,
type => 23,
- cachegroup => 2,
+ cachegroup => 200,
},
},
);
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/496bcab5/traffic_ops/app/t/api/1.1/asn.t
----------------------------------------------------------------------
diff --git a/traffic_ops/app/t/api/1.1/asn.t b/traffic_ops/app/t/api/1.1/asn.t
index 824592c..be1a008 100644
--- a/traffic_ops/app/t/api/1.1/asn.t
+++ b/traffic_ops/app/t/api/1.1/asn.t
@@ -40,15 +40,15 @@ Test::TestHelper->load_core_data($schema);
ok $t->post_ok( '/login', => form => { u => Test::TestHelper::ADMIN_USER, p => Test::TestHelper::ADMIN_USER_PASSWORD } )->status_is(302)
->or( sub { diag $t->tx->res->content->asset->{content}; } );
-$t->get_ok("/api/1.1/asns.json")->status_is(200)->json_is( "/response/asns/0/id", "1" )->json_is( "/response/asns/0/cachegroup", "mid-northeast-group" )
- ->json_is( "/response/asns/0/asn", "9939" )->or( sub { diag $t->tx->res->content->asset->{content}; } );
+$t->get_ok("/api/1.1/asns.json")->status_is(200)->json_is( "/response/asns/0/id", 100 )->json_is( "/response/asns/0/cachegroup", "mid-northeast-group" )
+ ->json_is( "/response/asns/0/asn", 9939 )->or( sub { diag $t->tx->res->content->asset->{content}; } );
-$t->get_ok("/api/1.1/asns.json?orderby=id")->status_is(200)->json_is( "/response/asns/0/id", "1" )
- ->json_is( "/response/asns/0/cachegroup", "mid-northeast-group" )->json_is( "/response/asns/0/asn", "9939" )
+$t->get_ok("/api/1.1/asns.json?orderby=id")->status_is(200)->json_is( "/response/asns/0/id", 100 )
+ ->json_is( "/response/asns/0/cachegroup", "mid-northeast-group" )->json_is( "/response/asns/0/asn", 9939 )
->or( sub { diag $t->tx->res->content->asset->{content}; } );
-$t->get_ok("/api/1.1/asns.json?orderby=cachegroup")->status_is(200)->json_is( "/response/asns/0/id", "1" )
- ->json_is( "/response/asns/0/cachegroup", "mid-northeast-group" )->json_is( "/response/asns/0/asn", "9939" )
+$t->get_ok("/api/1.1/asns.json?orderby=cachegroup")->status_is(200)->json_is( "/response/asns/0/id", 100 )
+ ->json_is( "/response/asns/0/cachegroup", "mid-northeast-group" )->json_is( "/response/asns/0/asn", 9939 )
->or( sub { diag $t->tx->res->content->asset->{content}; } );
ok $t->get_ok('/logout')->status_is(302)->or( sub { diag $t->tx->res->content->asset->{content}; } );
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/496bcab5/traffic_ops/app/t/api/1.2/asn.t
----------------------------------------------------------------------
diff --git a/traffic_ops/app/t/api/1.2/asn.t b/traffic_ops/app/t/api/1.2/asn.t
index 8659d67..0ed6f1c 100644
--- a/traffic_ops/app/t/api/1.2/asn.t
+++ b/traffic_ops/app/t/api/1.2/asn.t
@@ -40,28 +40,28 @@ Test::TestHelper->load_core_data($schema);
ok $t->post_ok( '/login', => form => { u => Test::TestHelper::ADMIN_USER, p => Test::TestHelper::ADMIN_USER_PASSWORD } )->status_is(302)
->or( sub { diag $t->tx->res->content->asset->{content}; } );
-$t->get_ok("/api/1.2/asns")->status_is(200)->json_is( "/response/0/id", 1 )->json_is( "/response/0/cachegroup", "mid-northeast-group" )
- ->json_is( "/response/0/asn", "9939" )->or( sub { diag $t->tx->res->content->asset->{content}; } );
+$t->get_ok("/api/1.2/asns")->status_is(200)->json_is( "/response/0/id", 100 )->json_is( "/response/0/cachegroup", "mid-northeast-group" )
+ ->json_is( "/response/0/asn", 9939 )->or( sub { diag $t->tx->res->content->asset->{content}; } );
-$t->get_ok("/api/1.2/asns?orderby=id")->status_is(200)->json_is( "/response/0/id", "1" )
- ->json_is( "/response/0/cachegroup", "mid-northeast-group" )->json_is( "/response/0/asn", "9939" )
+$t->get_ok("/api/1.2/asns?orderby=id")->status_is(200)->json_is( "/response/0/id", 100 )
+ ->json_is( "/response/0/cachegroup", "mid-northeast-group" )->json_is( "/response/0/asn", 9939 )
->or( sub { diag $t->tx->res->content->asset->{content}; } );
-$t->get_ok("/api/1.2/asns?orderby=cachegroup")->status_is(200)->json_is( "/response/0/id", "1" )
- ->json_is( "/response/0/cachegroup", "mid-northeast-group" )->json_is( "/response/0/asn", "9939" )
+$t->get_ok("/api/1.2/asns?orderby=cachegroup")->status_is(200)->json_is( "/response/0/id", 100 )
+ ->json_is( "/response/0/cachegroup", "mid-northeast-group" )->json_is( "/response/0/asn", 9939 )
->or( sub { diag $t->tx->res->content->asset->{content}; } );
-$t->get_ok("/api/1.2/asns/2")->status_is(200)->json_is( "/response/0/id", "2" )
- ->json_is( "/response/0/cachegroup", "mid-northwest-group" )->json_is( "/response/0/asn", "9940" )
+$t->get_ok("/api/1.2/asns/200")->status_is(200)->json_is( "/response/0/id", 200 )
+ ->json_is( "/response/0/cachegroup", "mid-northwest-group" )->json_is( "/response/0/asn", 9940 )
->or( sub { diag $t->tx->res->content->asset->{content}; } );
ok $t->post_ok('/api/1.2/asns' => {Accept => 'application/json'} => json => {
"asn" => 852,
- "cachegroupId" => 1
+ "cachegroupId" => 100
})
->status_is(200)->or( sub { diag $t->tx->res->content->asset->{content}; } )
->json_is( "/response/asn" => 852 )
- ->json_is( "/response/cachegroupId" => 1 )
+ ->json_is( "/response/cachegroupId" => 100 )
->json_is( "/response/cachegroup" => "mid-northeast-group" )
->json_is( "/alerts/0/level" => "success" )
->json_is( "/alerts/0/text" => "ASN create was successful." )
@@ -71,7 +71,7 @@ my $asn_id = &get_asn_id(852);
ok $t->put_ok('/api/1.2/asns/' . $asn_id => {Accept => 'application/json'} => json => {
"asn" => 853,
- "cachegroupId" => 1
+ "cachegroupId" => 100
})
->status_is(200)->or( sub { diag $t->tx->res->content->asset->{content}; } )
->json_is( "/response/asn" => 853 )
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/496bcab5/traffic_ops/app/t/api/1.2/cdn.t
----------------------------------------------------------------------
diff --git a/traffic_ops/app/t/api/1.2/cdn.t b/traffic_ops/app/t/api/1.2/cdn.t
index aed0845..6327a5e 100644
--- a/traffic_ops/app/t/api/1.2/cdn.t
+++ b/traffic_ops/app/t/api/1.2/cdn.t
@@ -29,17 +29,21 @@ use Test::TestHelper;
BEGIN { $ENV{MOJO_MODE} = "test" }
my $schema = Schema->connect_to_database;
-my $schema_values = { schema => $schema, no_transactions => 1 };
my $dbh = Schema->database_handle;
my $t = Test::Mojo->new('TrafficOps');
Test::TestHelper->unload_core_data($schema);
-Test::TestHelper->load_all_fixtures( Fixtures::Role->new($schema_values) );
-Test::TestHelper->load_all_fixtures( Fixtures::TmUser->new($schema_values) );
+Test::TestHelper->load_core_data($schema);
ok $t->post_ok( '/login', => form => { u => Test::TestHelper::ADMIN_USER, p => Test::TestHelper::ADMIN_USER_PASSWORD } )->status_is(302)
->or( sub { diag $t->tx->res->content->asset->{content}; } ), 'Should login?';
+$t->get_ok("/api/1.2/cdns")->status_is(200)->json_is( "/response/0/id", 100 )
+ ->json_is( "/response/0/name", "cdn1" )->or( sub { diag $t->tx->res->content->asset->{content}; } );
+
+$t->get_ok("/api/1.2/cdns/100")->status_is(200)->json_is( "/response/0/id", 100 )
+ ->json_is( "/response/0/name", "cdn1" )->or( sub { diag $t->tx->res->content->asset->{content}; } );
+
ok $t->post_ok('/api/1.2/cdns' => {Accept => 'application/json'} => json => {
"name" => "cdn_test", "dnssecEnabled" => "true" })
->status_is(200)->or( sub { diag $t->tx->res->content->asset->{content}; } )
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/496bcab5/traffic_ops/app/t/api/1.2/deliveryservice_server.t
----------------------------------------------------------------------
diff --git a/traffic_ops/app/t/api/1.2/deliveryservice_server.t b/traffic_ops/app/t/api/1.2/deliveryservice_server.t
index 9f705de..59a9a4d 100644
--- a/traffic_ops/app/t/api/1.2/deliveryservice_server.t
+++ b/traffic_ops/app/t/api/1.2/deliveryservice_server.t
@@ -41,23 +41,23 @@ Test::TestHelper->load_core_data($schema);
ok $t->post_ok( '/login', => form => { u => Test::TestHelper::ADMIN_USER, p => Test::TestHelper::ADMIN_USER_PASSWORD } )->status_is(302)
->or( sub { diag $t->tx->res->content->asset->{content}; } ), 'Should login?';
-ok $t->post_ok('/api/1.2/cachegroups/3/deliveryservices' => {Accept => 'application/json'} => json => {
+ok $t->post_ok('/api/1.2/cachegroups/300/deliveryservices' => {Accept => 'application/json'} => json => {
"deliveryServices" => [ 100 ]})
->status_is(200)->or( sub { diag $t->tx->res->content->asset->{content}; } )
- ->json_is( "/response/id" => 3 )
+ ->json_is( "/response/id" => 300 )
->json_is( "/response/deliveryServices/0" => 100 )
->json_is( "/alerts/0/level" => "success" )
- ->json_is( "/alerts/0/text" => "Delivery services successfully assigned to all the servers of cache group 3" )
+ ->json_is( "/alerts/0/text" => "Delivery services successfully assigned to all the servers of cache group 300" )
, 'Does the delivery services assign details return?';
ok $t->get_ok('/api/1.2/deliveryserviceserver.json')
->status_is(200)->or( sub { diag $t->tx->res->content->asset->{content}; } )
->json_is( "/response/0/deliveryService" => "100" )
- ->json_is( "/response/0/server" => "100" )
- ->json_is( "/response/1/deliveryService" => "100" )
- ->json_is( "/response/1/server" => "300" )
- ->json_is( "/response/2/deliveryService" => "100" )
- ->json_is( "/response/2/server" => "600" )
+ ->json_is( "/response/0/server" => 100 )
+ ->json_is( "/response/1/deliveryService" => 100 )
+ ->json_is( "/response/1/server" => 300 )
+ ->json_is( "/response/2/deliveryService" => 100 )
+ ->json_is( "/response/2/server" => 600 )
, 'Does the delivery services servers details return?';
ok $t->get_ok('/logout')->status_is(302)->or( sub { diag $t->tx->res->content->asset->{content}; } );
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/496bcab5/traffic_ops/app/t/api/1.2/division.t
----------------------------------------------------------------------
diff --git a/traffic_ops/app/t/api/1.2/division.t b/traffic_ops/app/t/api/1.2/division.t
index 66dfd45..eef9297 100644
--- a/traffic_ops/app/t/api/1.2/division.t
+++ b/traffic_ops/app/t/api/1.2/division.t
@@ -29,33 +29,30 @@ use Test::TestHelper;
BEGIN { $ENV{MOJO_MODE} = "test" }
my $schema = Schema->connect_to_database;
-my $schema_values = { schema => $schema, no_transactions => 1 };
my $dbh = Schema->database_handle;
my $t = Test::Mojo->new('TrafficOps');
Test::TestHelper->unload_core_data($schema);
-Test::TestHelper->load_all_fixtures( Fixtures::Cdn->new($schema_values) );
-Test::TestHelper->load_all_fixtures( Fixtures::Role->new($schema_values) );
-Test::TestHelper->load_all_fixtures( Fixtures::TmUser->new($schema_values) );
+Test::TestHelper->load_core_data($schema);
ok $t->post_ok( '/login', => form => { u => Test::TestHelper::ADMIN_USER, p => Test::TestHelper::ADMIN_USER_PASSWORD } )->status_is(302)
->or( sub { diag $t->tx->res->content->asset->{content}; } ), 'Should login?';
-$t->get_ok("/api/1.2/divisions")->status_is(200)->json_is( "/response/0/id", 1 )
+$t->get_ok("/api/1.2/divisions")->status_is(200)->json_is( "/response/0/id", 100 )
->json_is( "/response/0/name", "mountain" )->or( sub { diag $t->tx->res->content->asset->{content}; } );
-$t->get_ok("/api/1.2/divisions/1")->status_is(200)->json_is( "/response/0/id", 1 )
+$t->get_ok("/api/1.2/divisions/100")->status_is(200)->json_is( "/response/0/id", 100 )
->json_is( "/response/0/name", "mountain" )->or( sub { diag $t->tx->res->content->asset->{content}; } );
ok $t->post_ok('/api/1.2/divisions' => {Accept => 'application/json'} => json => {
"name" => "division1" })->status_is(200)->or( sub { diag $t->tx->res->content->asset->{content}; } )
->json_is( "/response/name" => "division1" )
, 'Does the division details return?';
+
ok $t->post_ok('/api/1.2/divisions' => {Accept => 'application/json'} => json => {
"name" => "division1" })->status_is(400);
-my $division_id = &get_division_id('divion1');
-
+my $division_id = &get_division_id('division1');
ok $t->put_ok('/api/1.2/divisions/' . $division_id => {Accept => 'application/json'} => json => {
"name" => "division2"
})
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/496bcab5/traffic_ops/app/t/api/1.2/physlocation.t
----------------------------------------------------------------------
diff --git a/traffic_ops/app/t/api/1.2/physlocation.t b/traffic_ops/app/t/api/1.2/physlocation.t
index 02e300a..3739c9b 100644
--- a/traffic_ops/app/t/api/1.2/physlocation.t
+++ b/traffic_ops/app/t/api/1.2/physlocation.t
@@ -49,10 +49,10 @@ ok $t->post_ok('/api/1.2/regions/non_region/phys_locations' => {Accept => 'appli
"name" => "physical location1",
"shortName" => "mountain"})->status_is(400);
-$t->get_ok("/api/1.2/phys_locations")->status_is(200)->json_is( "/response/0/id", 2 )
+$t->get_ok("/api/1.2/phys_locations")->status_is(200)->json_is( "/response/0/id", 200 )
->json_is( "/response/0/name", "Boulder" )->or( sub { diag $t->tx->res->content->asset->{content}; } );
-$t->get_ok("/api/1.2/phys_locations/1")->status_is(200)->json_is( "/response/0/id", 1 )
+$t->get_ok("/api/1.2/phys_locations/100")->status_is(200)->json_is( "/response/0/id", 100 )
->json_is( "/response/0/name", "Denver" )->or( sub { diag $t->tx->res->content->asset->{content}; } );
ok $t->post_ok('/api/1.2/phys_locations' => {Accept => 'application/json'} => json => {
@@ -62,7 +62,7 @@ ok $t->post_ok('/api/1.2/phys_locations' => {Accept => 'application/json'} => js
"city" => "city",
"state" => "state",
"zip" => "zip",
- "regionId" => 1,
+ "regionId" => 100,
})
->status_is(200)->or( sub { diag $t->tx->res->content->asset->{content}; } )
->json_is( "/response/name" => "phys1" )
@@ -79,7 +79,7 @@ ok $t->put_ok('/api/1.2/phys_locations/' . $phys_loc_id => {Accept => 'applicat
"city" => "city",
"state" => "state",
"zip" => "zip",
- "regionId" => 1,
+ "regionId" => 100,
})
->status_is(200)->or( sub { diag $t->tx->res->content->asset->{content}; } )
->json_is( "/response/name" => "phys2" )
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/496bcab5/traffic_ops/app/t/api/1.2/region.t
----------------------------------------------------------------------
diff --git a/traffic_ops/app/t/api/1.2/region.t b/traffic_ops/app/t/api/1.2/region.t
index a6bbbea..c4c35ad 100644
--- a/traffic_ops/app/t/api/1.2/region.t
+++ b/traffic_ops/app/t/api/1.2/region.t
@@ -29,14 +29,11 @@ use Test::TestHelper;
BEGIN { $ENV{MOJO_MODE} = "test" }
my $schema = Schema->connect_to_database;
-my $schema_values = { schema => $schema, no_transactions => 1 };
+my $dbh = Schema->database_handle;
my $t = Test::Mojo->new('TrafficOps');
Test::TestHelper->unload_core_data($schema);
-Test::TestHelper->load_all_fixtures( Fixtures::Cdn->new($schema_values) );
-Test::TestHelper->load_all_fixtures( Fixtures::Role->new($schema_values) );
-Test::TestHelper->load_all_fixtures( Fixtures::TmUser->new($schema_values) );
-Test::TestHelper->load_all_fixtures( Fixtures::Division->new($schema_values) );
+Test::TestHelper->load_core_data($schema);
ok $t->post_ok( '/login', => form => { u => Test::TestHelper::ADMIN_USER, p => Test::TestHelper::ADMIN_USER_PASSWORD } )->status_is(302)
->or( sub { diag $t->tx->res->content->asset->{content}; } ), 'Should login?';
@@ -46,22 +43,23 @@ ok $t->post_ok('/api/1.2/divisions/mountain/regions' => {Accept => 'application/
->json_is( "/response/name" => "region1" )
->json_is( "/response/divisionName" => "mountain" )
, 'Does the region details return?';
+
ok $t->post_ok('/api/1.2/divisions/mountain/regions' => {Accept => 'application/json'} => json => {
"name" => "region1"})->status_is(400);
-$t->get_ok("/api/1.2/regions")->status_is(200)->json_is( "/response/0/id", 2 )
+$t->get_ok("/api/1.2/regions")->status_is(200)->json_is( "/response/0/id", 200 )
->json_is( "/response/0/name", "Boulder Region" )->or( sub { diag $t->tx->res->content->asset->{content}; } );
-$t->get_ok("/api/1.2/regions/1")->status_is(200)->json_is( "/response/0/id", 1 )
+$t->get_ok("/api/1.2/regions/100")->status_is(200)->json_is( "/response/0/id", 100 )
->json_is( "/response/0/name", "Denver Region" )->or( sub { diag $t->tx->res->content->asset->{content}; } );
ok $t->post_ok('/api/1.2/regions' => {Accept => 'application/json'} => json => {
"name" => "reg1",
- "division" => 1
+ "division" => 100
})
->status_is(200)->or( sub { diag $t->tx->res->content->asset->{content}; } )
->json_is( "/response/name" => "reg1" )
- ->json_is( "/response/division" => 1 )
+ ->json_is( "/response/division" => 100 )
->json_is( "/alerts/0/level" => "success" )
->json_is( "/alerts/0/text" => "Region create was successful." )
, 'Do the region details return?';
@@ -70,11 +68,11 @@ my $region_id = &get_reg_id('reg1');
ok $t->put_ok('/api/1.2/regions/' . $region_id => {Accept => 'application/json'} => json => {
"name" => "reg2",
- "division" => 1
+ "division" => 100
})
->status_is(200)->or( sub { diag $t->tx->res->content->asset->{content}; } )
->json_is( "/response/name" => "reg2" )
- ->json_is( "/response/division" => 1 )
+ ->json_is( "/response/division" => 100 )
->json_is( "/alerts/0/level" => "success" )
, 'Do the regions details return?';
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/496bcab5/traffic_ops/app/t/api/1.2/server.t
----------------------------------------------------------------------
diff --git a/traffic_ops/app/t/api/1.2/server.t b/traffic_ops/app/t/api/1.2/server.t
index f4af185..3cc0040 100644
--- a/traffic_ops/app/t/api/1.2/server.t
+++ b/traffic_ops/app/t/api/1.2/server.t
@@ -31,23 +31,11 @@ use Data::Dumper;
BEGIN { $ENV{MOJO_MODE} = "test" }
my $schema = Schema->connect_to_database;
-my $schema_values = { schema => $schema, no_transactions => 1 };
my $dbh = Schema->database_handle;
my $t = Test::Mojo->new('TrafficOps');
Test::TestHelper->unload_core_data($schema);
-Test::TestHelper->load_all_fixtures( Fixtures::Cdn->new($schema_values) );
-Test::TestHelper->load_all_fixtures( Fixtures::Role->new($schema_values) );
-Test::TestHelper->load_all_fixtures( Fixtures::TmUser->new($schema_values) );
-Test::TestHelper->load_all_fixtures( Fixtures::Status->new($schema_values) );
-Test::TestHelper->load_all_fixtures( Fixtures::Parameter->new($schema_values) );
-Test::TestHelper->load_all_fixtures( Fixtures::Profile->new($schema_values) );
-Test::TestHelper->load_all_fixtures( Fixtures::ProfileParameter->new($schema_values) );
-Test::TestHelper->load_all_fixtures( Fixtures::Division->new($schema_values) );
-Test::TestHelper->load_all_fixtures( Fixtures::Region->new($schema_values) );
-Test::TestHelper->load_all_fixtures( Fixtures::PhysLocation->new($schema_values) );
-Test::TestHelper->load_all_fixtures( Fixtures::Type->new($schema_values) );
-Test::TestHelper->load_all_fixtures( Fixtures::Deliveryservice->new($schema_values) );
+Test::TestHelper->load_core_data($schema);
sub get_svr_id {
my $host_name = shift;
@@ -81,14 +69,14 @@ ok $t->post_ok('/api/1.2/cachegroups/create' => {Accept => 'application/json'} =
, 'Does the cache group details return?';
ok $t->post_ok('/api/1.2/cachegroups/create' => {Accept => 'application/json'} => json => {
- "name" => "mid-northeast-group",
+ "name" => "cg-mid-northeast",
"shortName" => "mneg",
"latitude" => "10",
"longitude" => "40",
"parentCachegroup" => "",
"secondaryParentCachegroup" => "",
"typeName" => "MID_LOC" })->status_is(200)->or( sub { diag $t->tx->res->content->asset->{content}; } )
- ->json_is( "/response/name" => "mid-northeast-group" )
+ ->json_is( "/response/name" => "cg-mid-northeast" )
->json_is( "/response/shortName" => "mneg")
->json_is( "/response/latitude" => "10")
->json_is( "/response/longitude" => "40")
@@ -96,22 +84,25 @@ ok $t->post_ok('/api/1.2/cachegroups/create' => {Accept => 'application/json'} =
->json_is( "/response/secondaryParentCachegroup" => "")
, 'Does the cache group details return?';
+
ok $t->get_ok('/api/1.2/servers?type=MID')->status_is(200)->or( sub { diag $t->tx->res->content->asset->{content}; } )
->json_is( "/response/0/hostName", "atlanta-mid-01" )
->json_is( "/response/0/domainName", "ga.atlanta.kabletown.net" )
->json_is( "/response/0/type", "MID" )
->or( sub { diag $t->tx->res->content->asset->{content}; } );
-ok $t->get_ok('/api/1.2/servers?cdn=1')->status_is(200)->or( sub { diag $t->tx->res->content->asset->{content}; } )
+
+
+ok $t->get_ok('/api/1.2/servers?cdn=100')->status_is(200)->or( sub { diag $t->tx->res->content->asset->{content}; } )
->json_is( "/response/0/hostName", "atlanta-edge-01" )
->json_is( "/response/0/domainName", "ga.atlanta.kabletown.net" )
- ->json_is( "/response/0/cdnId", 1 )
+ ->json_is( "/response/0/cdnId", 100 )
->or( sub { diag $t->tx->res->content->asset->{content}; } );
-ok $t->get_ok('/api/1.2/servers?cachegroup=2')->status_is(200)->or( sub { diag $t->tx->res->content->asset->{content}; } )
+ok $t->get_ok('/api/1.2/servers?cachegroup=200')->status_is(200)->or( sub { diag $t->tx->res->content->asset->{content}; } )
->json_is( "/response/0/hostName", "atlanta-mid-02" )
->json_is( "/response/0/domainName", "ga.atlanta.kabletown.net" )
- ->json_is( "/response/0/cachegroupId", 2 )
+ ->json_is( "/response/0/cachegroupId", 200 )
->or( sub { diag $t->tx->res->content->asset->{content}; } );
ok $t->get_ok('/api/1.2/servers?type=MID&status=ONLINE')->status_is(200)->or( sub { diag $t->tx->res->content->asset->{content}; } )
@@ -121,22 +112,26 @@ ok $t->get_ok('/api/1.2/servers?type=MID&status=ONLINE')->status_is(200)->or( su
->json_is( "/response/0/status", "ONLINE" )
->or( sub { diag $t->tx->res->content->asset->{content}; } );
+
+
ok $t->post_ok('/api/1.2/cachegroups/create' => {Accept => 'application/json'} => json => {
- "name" => "edge_atl_group",
- "shortName" => "eag",
+ "name" => "edge_atl_group1",
+ "shortName" => "eag1",
"latitude" => "22",
"longitude" => "55",
"parentCachegroup" => "",
"secondaryParentCachegroup" => "",
"typeName" => "MID_LOC" })->status_is(200)->or( sub { diag $t->tx->res->content->asset->{content}; } )
- ->json_is( "/response/name" => "edge_atl_group" )
- ->json_is( "/response/shortName" => "eag")
+ ->json_is( "/response/name" => "edge_atl_group1" )
+ ->json_is( "/response/shortName" => "eag1")
->json_is( "/response/latitude" => "22")
->json_is( "/response/longitude" => "55")
->json_is( "/response/parentCachegroup" => "")
->json_is( "/response/secondaryParentCachegroup" => "")
, 'Does the cache group details return?';
+
+
ok $t->post_ok('/api/1.2/servers/create' => {Accept => 'application/json'} => json => {
"hostName" => "server1",
"domainName" => "example-domain.com",
@@ -153,6 +148,7 @@ ok $t->post_ok('/api/1.2/servers/create' => {Accept => 'application/json'} => js
->status_is(200)->or( sub { diag $t->tx->res->content->asset->{content}; } )
, 'Is a server created when all required fields are provided?';
+
ok $t->post_ok('/api/1.2/servers/create' => {Accept => 'application/json'} => json => {
"hostName" => "server2",
"domainName" => "example-domain.com",
@@ -313,27 +309,19 @@ ok $t->post_ok('/api/1.2/servers/create' => {Accept => 'application/json'} => js
->json_is( "/response/profile" => "MID1")
, 'Does the server details return?';
-
-
ok $t->post_ok('/api/1.2/deliveryservices/test-ds1/servers' => {Accept => 'application/json'} => json => { "serverNames" => [ 'server1', 'server3' ]})
->status_is(200)->or( sub { diag $t->tx->res->content->asset->{content}; } )
, 'Assign the server to the delivery service?';
-
ok $t->get_ok('/api/1.2/servers/details.json?hostName=server1')->status_is(200)->or( sub { diag $t->tx->res->content->asset->{content}; } )
->json_is( "/response/0/ipGateway", "10.74.27.194" )->json_is( "/response/0/deliveryservices/0", "100" ), 'Does the hostname details return?';
-ok $t->get_ok('/api/1.2/servers/details.json?physLocationID=100')->status_is(200)->or( sub { diag $t->tx->res->content->asset->{content}; } )
- ->json_is( "/response/0/ipGateway", "10.74.27.194" )->json_is( "/response/0/deliveryservices/0", "100" ), 'Does the physLocationID details return?';
-
ok $t->get_ok('/api/1.2/servers/details')->status_is(400)->or( sub { diag $t->tx->res->content->asset->{content}; } ),
'Does the validation error occur?';
ok $t->get_ok('/api/1.2/servers/details.json?orderby=hostName')->status_is(400)->or( sub { diag $t->tx->res->content->asset->{content}; } ),
'Does the orderby work?';
ok $t->get_ok('/api/1.2/servers?type=MID')->status_is(200)->or( sub { diag $t->tx->res->content->asset->{content}; } )
- ->json_is( "/response/0/hostName", "tc1_ats1" )
- ->json_is( "/response/0/domainName", "northbound.com" )
->json_is( "/response/0/type", "MID" )
->or( sub { diag $t->tx->res->content->asset->{content}; } );
@@ -352,8 +340,6 @@ ok $t->post_ok('/api/1.2/deliveryservices/test-ds4/servers' => {Accept => 'appli
ok $t->get_ok('/api/1.2/servers?type=MID&status=ONLINE')->status_is(200)->or( sub { diag $t->tx->res->content->asset->{content}; } )
- ->json_is( "/response/0/hostName", "tc1_ats1" )
- ->json_is( "/response/0/domainName", "northbound.com" )
->json_is( "/response/0/type", "MID" )
->json_is( "/response/0/status", "ONLINE" )
->or( sub { diag $t->tx->res->content->asset->{content}; } );
@@ -445,18 +431,8 @@ ok $t->put_ok('/api/1.2/servers/' . $svr_id . '/update' => {Accept => 'applicat
"physLocation" => "HotAtlanta" })
->status_is(404)->or( sub { diag $t->tx->res->content->asset->{content}; } );
-$svr_id1 = &get_svr_id('server1');
-my $svr_id2 = &get_svr_id('server3');
-my $svr_id3 = &get_svr_id('tc1_ats1');
-my $svr_id4 = &get_svr_id('tc1_ats2');
-ok $t->get_ok('/api/1.2/servers?profileId=100&orderby=id' => {Accept => 'application/json'})->status_is(200)
- ->status_is(200)->or( sub { diag $t->tx->res->content->asset->{content}; } )
- ->json_is( "/response/0/id", $svr_id1 )
- ->json_is( "/response/1/id", $svr_id2 )
- ->json_is( "/response/2/id", $svr_id3 )
- ->json_is( "/response/3/id", $svr_id4 )
- , "Does the server ids return?";
-
ok $t->get_ok('/logout')->status_is(302)->or( sub { diag $t->tx->res->content->asset->{content}; } );
$dbh->disconnect();
done_testing();
+
+
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/496bcab5/traffic_ops/app/t/deliveryservice.t
----------------------------------------------------------------------
diff --git a/traffic_ops/app/t/deliveryservice.t b/traffic_ops/app/t/deliveryservice.t
index e418945..99866b1 100644
--- a/traffic_ops/app/t/deliveryservice.t
+++ b/traffic_ops/app/t/deliveryservice.t
@@ -79,7 +79,7 @@ ok $t->post_ok(
'ds.multi_site_origin' => '0',
'ds.multi_site_origin_algorithm' => '0',
'ds.profile' => '100',
- 'ds.cdn_id' => '1',
+ 'ds.cdn_id' => '100',
'ds.qstring_ignore' => '0',
're_order_0' => '0',
're_re_0' => '.*\.jvdtest\..*',
@@ -129,7 +129,7 @@ ok $t->post_ok(
'ds.multi_site_origin' => '0',
'ds.multi_site_origin_algorithm' => '0',
'ds.profile' => '100',
- 'ds.cdn_id' => '1',
+ 'ds.cdn_id' => '100',
'ds.qstring_ignore' => '0',
'ds.signed' => '0',
'ds.type' => '9',
@@ -179,7 +179,7 @@ ok $t->post_ok(
'ds.multi_site_origin' => '0',
'ds.multi_site_origin_algorithm' => '0',
'ds.profile' => '100',
- 'ds.cdn_id' => '1',
+ 'ds.cdn_id' => '100',
'ds.qstring_ignore' => '1',
'ds.signed' => '1',
'ds.type' => '9',
@@ -259,7 +259,7 @@ ok $t->post_ok(
'ds.multi_site_origin' => '0',
'ds.multi_site_origin_algorithm' => '0',
'ds.profile' => '200',
- 'ds.cdn_id' => '2',
+ 'ds.cdn_id' => '200',
'ds.qstring_ignore' => '0',
'ds.signed' => '0',
'ds.type' => '7',
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/496bcab5/traffic_ops/app/t/phys_location.t
----------------------------------------------------------------------
diff --git a/traffic_ops/app/t/phys_location.t b/traffic_ops/app/t/phys_location.t
index 902020c..6ee5f18 100644
--- a/traffic_ops/app/t/phys_location.t
+++ b/traffic_ops/app/t/phys_location.t
@@ -69,7 +69,7 @@ $t->post_ok(
'location.poc' => 'Jan van Doorn',
'location.email' => 'jvd@comcast.com',
'location.comments' => 'boo',
- 'location.region' => '1',
+ 'location.region' => '100',
}
)->status_is(302)->or( sub { diag $t->tx->res->content->asset->{content}; } );
@@ -86,7 +86,7 @@ $t->post_ok(
'location.poc' => 'Bubba',
'location.email' => 'Louie was here',
'location.comments' => 'boo',
- 'location.region' => '1',
+ 'location.region' => '100',
}
)->status_is(200)->message( 'invalid email' );
@@ -115,7 +115,7 @@ sub upd_and_del() {
'location.phone' => '800-334-5545',
'location.email' => 'jvd@comcast.com',
'location.comments' => 'boo',
- 'location.region' => '1',
+ 'location.region' => '100',
}
)->status_is(302)->or( sub { diag $t->tx->res->content->asset->{content}; } );
$t->get_ok( "/phys_location/$id/delete" )->status_is(302);
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/496bcab5/traffic_ops/app/t/server.t
----------------------------------------------------------------------
diff --git a/traffic_ops/app/t/server.t b/traffic_ops/app/t/server.t
index 069d50a..5010561 100644
--- a/traffic_ops/app/t/server.t
+++ b/traffic_ops/app/t/server.t
@@ -117,10 +117,10 @@ $t->post_ok(
ip6_gateway => '2009:334:333::1',
interface_mtu => '9000',
phys_location => 100,
- cachegroup => 1,
+ cachegroup => 100,
type => 1,
profile => 100,
- cdn => 1,
+ cdn => 100,
mgmt_ip_address => '192.168.1.1',
mgmt_ip_gateway => '192.168.1.2',
mgmt_ip_netmask => '255.255.255.0',
@@ -162,10 +162,10 @@ sub upd_and_del() {
ip6_gateway => '2009:334:333::1',
interface_mtu => '9000',
phys_location => 100,
- cachegroup => 1,
+ cachegroup => 100,
type => 1,
profile => 100,
- cdn_id => 1,
+ cdn_id => 100,
mgmt_ip_address => '192.168.3.1',
mgmt_ip_netmask => '192.168.3.2',
mgmt_ip_gateway => '255.255.255.0',