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:36 UTC
[21/40] incubator-trafficcontrol git commit: checkpoint update for
fixture alignment
checkpoint update for fixture 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/68fb6859
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/tree/68fb6859
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/diff/68fb6859
Branch: refs/heads/psql-rebase
Commit: 68fb68591553edc4833709dbf29a16b729c449d3
Parents: 3aa8385
Author: Dewayne Richardson <de...@apache.org>
Authored: Wed Nov 16 10:52:26 2016 -0700
Committer: Dan Kirkwood <da...@gmail.com>
Committed: Mon Nov 21 12:04:09 2016 -0700
----------------------------------------------------------------------
traffic_ops/app/lib/Fixtures/Cdn.pm | 2 +
traffic_ops/app/lib/Fixtures/Deliveryservice.pm | 387 +++++++++----------
.../app/lib/Fixtures/DeliveryserviceServer.pm | 23 +-
.../app/lib/Fixtures/DeliveryserviceTmuser.pm | 8 +-
traffic_ops/app/lib/Fixtures/TmUser.pm | 74 ++--
.../app/t/api/1.1/deliveryserviceserver.t | 2 +-
6 files changed, 246 insertions(+), 250 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/68fb6859/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 61223d5..dacb604 100644
--- a/traffic_ops/app/lib/Fixtures/Cdn.pm
+++ b/traffic_ops/app/lib/Fixtures/Cdn.pm
@@ -23,6 +23,7 @@ my %definition_for = (
cdn1_cdn_name => {
new => 'Cdn',
using => {
+ id => 1,
name => 'cdn1',
},
},
@@ -30,6 +31,7 @@ my %definition_for = (
cdn2_cdn_name => {
new => 'Cdn',
using => {
+ id => 2,
name => 'cdn2',
},
},
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/68fb6859/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 37b5699..7198e01 100644
--- a/traffic_ops/app/lib/Fixtures/Deliveryservice.pm
+++ b/traffic_ops/app/lib/Fixtures/Deliveryservice.pm
@@ -19,30 +19,30 @@ extends 'DBIx::Class::EasyFixture';
use namespace::autoclean;
my %definition_for = (
- ## id => 1
- steering_ds1 => {
- new => 'Deliveryservice',
+ ds_cdn1 => {
+ new => 'Deliveryservice',
using => {
id => 1,
- xml_id => 'steering-ds1',
+ xml_id => 'test-ds1',
active => 1,
dscp => 40,
signed => 0,
qstring_ignore => 0,
geo_limit => 0,
http_bypass_fqdn => '',
- dns_bypass_ip => 'hokeypokey',
- dns_bypass_ttl => 10,
+ dns_bypass_ip => '',
+ dns_bypass_ip6 => '',
+ dns_bypass_ttl => -1,
ccr_dns_ttl => 3600,
global_max_mbps => 0,
global_max_tps => 0,
- long_desc => 'steering-ds1 long_desc',
- long_desc_1 => 'steering-ds1 long_desc_1',
- long_desc_2 => 'steering-ds1 long_desc_2',
+ long_desc => 'test-ds1 long_desc',
+ long_desc_1 => 'test-ds1 long_desc_1',
+ long_desc_2 => 'test-ds1 long_desc_2',
max_dns_answers => 0,
protocol => 0,
- org_server_fqdn => 'http://steering-ds1.edge',
- info_url => 'http://steering-ds1.edge/info_url.html',
+ org_server_fqdn => 'http://test-ds1.edge',
+ info_url => 'http://test-ds1.edge/info_url.html',
miss_lat => '41.881944',
miss_long => '-87.627778',
check_path => '/crossdomain.xml',
@@ -51,202 +51,207 @@ my %definition_for = (
cdn_id => 1,
ipv6_routing_enabled => 1,
protocol => 1,
- display_name => 'steering-ds1-displayname',
+ display_name => 'test-ds1-displayname',
initial_dispersion => 1,
regional_geo_blocking => 1,
+ logs_enabled => 1,
},
},
- ## id => 2
- steering_ds2 => {
+ ds_cdn2 => {
new => 'Deliveryservice',
using => {
id => 2,
- xml_id => 'steering-ds2',
+ xml_id => 'test-ds2',
active => 1,
dscp => 40,
signed => 0,
qstring_ignore => 0,
geo_limit => 0,
http_bypass_fqdn => '',
- dns_bypass_ip => 'hokeypokey',
- dns_bypass_ttl => 10,
+ dns_bypass_ip => '',
+ dns_bypass_ip6 => '',
+ dns_bypass_ttl => -1,
ccr_dns_ttl => 3600,
global_max_mbps => 0,
global_max_tps => 0,
- long_desc => 'steering-ds2 long_desc',
- long_desc_1 => 'steering-ds2 long_desc_1',
- long_desc_2 => 'steering-ds2 long_desc_2',
+ long_desc => 'test-ds2 long_desc',
+ long_desc_1 => 'test-ds2 long_desc_1',
+ long_desc_2 => 'test-ds2 long_desc_2',
max_dns_answers => 0,
protocol => 0,
- org_server_fqdn => 'http://steering-ds2.edge',
- info_url => 'http://steering-ds2.edge/info_url.html',
+ org_server_fqdn => 'http://test-ds2.edge',
+ info_url => 'http://test-ds2.edge/info_url.html',
miss_lat => '41.881944',
miss_long => '-87.627778',
check_path => '/crossdomain.xml',
- type => 21,
+ type => 9,
profile => 1,
cdn_id => 1,
- ipv6_routing_enabled => 1,
- protocol => 1,
- display_name => 'steering-ds2-displayname',
+ display_name => 'test-ds2-displayname',
initial_dispersion => 1,
- regional_geo_blocking => 1,
+ geo_provider => 0,
+ regional_geo_blocking => 0,
+ ipv6_routing_enabled => 0,
+ logs_enabled => 0,
},
},
- ## id => 3
- new_steering => {
+ ds_cdn3 => {
new => 'Deliveryservice',
using => {
id => 3,
- xml_id => 'steering-ds3',
+ xml_id => 'test-ds3',
active => 1,
dscp => 40,
signed => 0,
qstring_ignore => 0,
geo_limit => 0,
http_bypass_fqdn => '',
- dns_bypass_ip => 'hokeypokey',
- dns_bypass_ttl => 10,
+ dns_bypass_ip => '',
+ dns_bypass_ip6 => '',
+ dns_bypass_ttl => -1,
ccr_dns_ttl => 3600,
global_max_mbps => 0,
global_max_tps => 0,
- long_desc => 'new-steering-ds long_desc',
- long_desc_1 => 'new-steering-ds long_desc_1',
- long_desc_2 => 'new-steering-ds long_desc_2',
+ long_desc => 'test-ds3 long_desc',
+ long_desc_1 => 'test-ds3 long_desc_1',
+ long_desc_2 => 'test-ds3 long_desc_2',
max_dns_answers => 0,
protocol => 0,
- org_server_fqdn => 'http://new-steering-ds.edge',
- info_url => 'http://new-steering-ds.edge/info_url.html',
+ org_server_fqdn => 'http://test-ds3.edge',
+ info_url => 'http://test-ds3.edge/info_url.html',
miss_lat => '41.881944',
miss_long => '-87.627778',
check_path => '/crossdomain.xml',
- type => 21,
+ type => 9,
profile => 1,
cdn_id => 1,
- ipv6_routing_enabled => 1,
- protocol => 1,
- display_name => 'new-steering-ds-displayname',
+ display_name => 'test-ds3-displayname',
initial_dispersion => 1,
- regional_geo_blocking => 1,
+ geo_provider => 0,
+ regional_geo_blocking => 0,
+ ipv6_routing_enabled => 0,
+ logs_enabled => 0,
},
},
- ## id => 4
- target_ds1 => {
+ ds_cdn4 => {
new => 'Deliveryservice',
using => {
id => 4,
- xml_id => 'steering-target-ds1',
+ xml_id => 'test-ds4',
active => 1,
dscp => 40,
signed => 0,
qstring_ignore => 0,
geo_limit => 0,
http_bypass_fqdn => '',
- dns_bypass_ip => 'hokeypokey',
- dns_bypass_ttl => 10,
+ dns_bypass_ip => '',
+ dns_bypass_ip6 => '',
+ dns_bypass_ttl => -1,
ccr_dns_ttl => 3600,
global_max_mbps => 0,
global_max_tps => 0,
- long_desc => 'target-ds1 long_desc',
- long_desc_1 => 'target-ds1 long_desc_1',
- long_desc_2 => 'target-ds1 long_desc_2',
+ long_desc => 'test-ds4 long_desc',
+ long_desc_1 => 'test-ds4 long_desc_1',
+ long_desc_2 => 'test-ds4 long_desc_2',
max_dns_answers => 0,
protocol => 0,
- org_server_fqdn => 'http://target-ds1.edge',
- info_url => 'http://target-ds1.edge/info_url.html',
+ org_server_fqdn => 'http://test-ds4.edge',
+ info_url => 'http://test-ds4.edge/info_url.html',
miss_lat => '41.881944',
miss_long => '-87.627778',
check_path => '/crossdomain.xml',
- type => 21,
+ type => 9,
profile => 1,
cdn_id => 1,
- ipv6_routing_enabled => 1,
- protocol => 1,
- display_name => 'target-ds1-displayname',
+ display_name => 'test-ds4-displayname',
initial_dispersion => 1,
- regional_geo_blocking => 1,
+ geo_provider => 0,
+ regional_geo_blocking => 0,
+ ipv6_routing_enabled => 0,
+ logs_enabled => 1,
},
},
- ## id => 5
- target_ds2 => {
+ ds_dns => {
new => 'Deliveryservice',
using => {
id => 5,
- xml_id => 'steering-target-ds2',
+ xml_id => 'test-ds5',
active => 1,
dscp => 40,
signed => 0,
qstring_ignore => 0,
geo_limit => 0,
http_bypass_fqdn => '',
- dns_bypass_ip => 'hokeypokey',
- dns_bypass_ttl => 10,
+ dns_bypass_ip => '',
+ dns_bypass_ip6 => '',
+ dns_bypass_ttl => -1,
ccr_dns_ttl => 3600,
global_max_mbps => 0,
global_max_tps => 0,
- long_desc => 'target-ds2 long_desc',
- long_desc_1 => 'target-ds2 long_desc_1',
- long_desc_2 => 'target-ds2 long_desc_2',
+ long_desc => 'test-ds5 long_desc',
+ long_desc_1 => 'test-ds5 long_desc_1',
+ long_desc_2 => 'test-ds5 long_desc_2',
max_dns_answers => 0,
protocol => 0,
- org_server_fqdn => 'http://target-ds2.edge',
- info_url => 'http://target-ds2.edge/info_url.html',
+ org_server_fqdn => 'http://test-ds5.edge',
+ info_url => 'http://test-ds5.edge/info_url.html',
miss_lat => '41.881944',
miss_long => '-87.627778',
check_path => '/crossdomain.xml',
- type => 21,
- profile => 1,
+ type => 7,
+ profile => 3,
cdn_id => 1,
- ipv6_routing_enabled => 1,
- protocol => 1,
- display_name => 'target-ds2-displayname',
+ display_name => 'test-ds5-displayname',
initial_dispersion => 1,
- regional_geo_blocking => 1,
+ geo_provider => 0,
+ regional_geo_blocking => 0,
+ ipv6_routing_enabled => 0,
+ logs_enabled => 0,
},
},
- ## id => 6
- target_ds3 => {
+ ds_http_no_cache => {
new => 'Deliveryservice',
using => {
id => 6,
- xml_id => 'steering-target-ds3',
+ xml_id => 'test-ds6',
active => 1,
dscp => 40,
signed => 0,
qstring_ignore => 0,
geo_limit => 0,
http_bypass_fqdn => '',
- dns_bypass_ip => 'hokeypokey',
- dns_bypass_ttl => 10,
+ dns_bypass_ip => '',
+ dns_bypass_ip6 => '',
+ dns_bypass_ttl => -1,
ccr_dns_ttl => 3600,
global_max_mbps => 0,
global_max_tps => 0,
- long_desc => 'target-ds3 long_desc',
- long_desc_1 => 'target-ds3 long_desc_1',
- long_desc_2 => 'target-ds3 long_desc_2',
+ long_desc => 'test-ds6 long_desc',
+ long_desc_1 => 'test-ds6 long_desc_1',
+ long_desc_2 => 'test-ds6 long_desc_2',
max_dns_answers => 0,
protocol => 0,
- org_server_fqdn => 'http://target-ds3.edge',
- info_url => 'http://target-ds3.edge/info_url.html',
+ org_server_fqdn => 'http://test-ds6.edge',
+ info_url => 'http://test-ds6.edge/info_url.html',
miss_lat => '41.881944',
miss_long => '-87.627778',
check_path => '/crossdomain.xml',
- type => 21,
- profile => 1,
+ type => 9,
+ profile => 3,
cdn_id => 1,
- ipv6_routing_enabled => 1,
- protocol => 1,
- display_name => 'target-ds3-displayname',
+ display_name => 'test-ds6-displayname',
initial_dispersion => 1,
- regional_geo_blocking => 1,
+ geo_provider => 0,
+ regional_geo_blocking => 0,
+ ipv6_routing_enabled => 0,
+ logs_enabled => 0,
},
},
- ## id => 7
- target_ds4 => {
+ steering_ds1 => {
new => 'Deliveryservice',
using => {
id => 7,
- xml_id => 'steering-target-ds4',
+ xml_id => 'steering-ds1',
active => 1,
dscp => 40,
signed => 0,
@@ -258,13 +263,13 @@ my %definition_for = (
ccr_dns_ttl => 3600,
global_max_mbps => 0,
global_max_tps => 0,
- long_desc => 'target-ds4 long_desc',
- long_desc_1 => 'target-ds4 long_desc_1',
- long_desc_2 => 'target-ds4 long_desc_2',
+ long_desc => 'steering-ds1 long_desc',
+ long_desc_1 => 'steering-ds1 long_desc_1',
+ long_desc_2 => 'steering-ds1 long_desc_2',
max_dns_answers => 0,
protocol => 0,
- org_server_fqdn => 'http://target-ds4.edge',
- info_url => 'http://target-ds4.edge/info_url.html',
+ org_server_fqdn => 'http://steering-ds1.edge',
+ info_url => 'http://steering-ds1.edge/info_url.html',
miss_lat => '41.881944',
miss_long => '-87.627778',
check_path => '/crossdomain.xml',
@@ -273,36 +278,34 @@ my %definition_for = (
cdn_id => 1,
ipv6_routing_enabled => 1,
protocol => 1,
- display_name => 'target-ds4-displayname',
+ display_name => 'steering-ds1-displayname',
initial_dispersion => 1,
regional_geo_blocking => 1,
},
},
- ## id => 8
- ds_cdn1 => {
- new => 'Deliveryservice',
+ steering_ds2 => {
+ new => 'Deliveryservice',
using => {
id => 8,
- xml_id => 'test-ds1',
+ xml_id => 'steering-ds2',
active => 1,
dscp => 40,
signed => 0,
qstring_ignore => 0,
geo_limit => 0,
http_bypass_fqdn => '',
- dns_bypass_ip => '',
- dns_bypass_ip6 => '',
- dns_bypass_ttl => -1,
+ dns_bypass_ip => 'hokeypokey',
+ dns_bypass_ttl => 10,
ccr_dns_ttl => 3600,
global_max_mbps => 0,
global_max_tps => 0,
- long_desc => 'test-ds1 long_desc',
- long_desc_1 => 'test-ds1 long_desc_1',
- long_desc_2 => 'test-ds1 long_desc_2',
+ long_desc => 'steering-ds2 long_desc',
+ long_desc_1 => 'steering-ds2 long_desc_1',
+ long_desc_2 => 'steering-ds2 long_desc_2',
max_dns_answers => 0,
protocol => 0,
- org_server_fqdn => 'http://test-ds1.edge',
- info_url => 'http://test-ds1.edge/info_url.html',
+ org_server_fqdn => 'http://steering-ds2.edge',
+ info_url => 'http://steering-ds2.edge/info_url.html',
miss_lat => '41.881944',
miss_long => '-87.627778',
check_path => '/crossdomain.xml',
@@ -311,203 +314,193 @@ my %definition_for = (
cdn_id => 1,
ipv6_routing_enabled => 1,
protocol => 1,
- display_name => 'test-ds1-displayname',
+ display_name => 'steering-ds2-displayname',
initial_dispersion => 1,
regional_geo_blocking => 1,
- logs_enabled => 1,
},
},
- ## id => 9
- ds_cdn2 => {
+ new_steering => {
new => 'Deliveryservice',
using => {
id => 9,
- xml_id => 'test-ds2',
+ xml_id => 'steering-ds3',
active => 1,
dscp => 40,
signed => 0,
qstring_ignore => 0,
geo_limit => 0,
http_bypass_fqdn => '',
- dns_bypass_ip => '',
- dns_bypass_ip6 => '',
- dns_bypass_ttl => -1,
+ dns_bypass_ip => 'hokeypokey',
+ dns_bypass_ttl => 10,
ccr_dns_ttl => 3600,
global_max_mbps => 0,
global_max_tps => 0,
- long_desc => 'test-ds2 long_desc',
- long_desc_1 => 'test-ds2 long_desc_1',
- long_desc_2 => 'test-ds2 long_desc_2',
+ long_desc => 'new-steering-ds long_desc',
+ long_desc_1 => 'new-steering-ds long_desc_1',
+ long_desc_2 => 'new-steering-ds long_desc_2',
max_dns_answers => 0,
protocol => 0,
- org_server_fqdn => 'http://test-ds2.edge',
- info_url => 'http://test-ds2.edge/info_url.html',
+ org_server_fqdn => 'http://new-steering-ds.edge',
+ info_url => 'http://new-steering-ds.edge/info_url.html',
miss_lat => '41.881944',
miss_long => '-87.627778',
check_path => '/crossdomain.xml',
- type => 9,
+ type => 21,
profile => 1,
cdn_id => 1,
- display_name => 'test-ds2-displayname',
+ ipv6_routing_enabled => 1,
+ protocol => 1,
+ display_name => 'new-steering-ds-displayname',
initial_dispersion => 1,
- geo_provider => 0,
- regional_geo_blocking => 0,
- ipv6_routing_enabled => 0,
- logs_enabled => 0,
+ regional_geo_blocking => 1,
},
},
- ## id => 10
- ds_cdn3 => {
+ ## id => 4
+ target_ds1 => {
new => 'Deliveryservice',
using => {
id => 10,
- xml_id => 'test-ds3',
+ xml_id => 'steering-target-ds1',
active => 1,
dscp => 40,
signed => 0,
qstring_ignore => 0,
geo_limit => 0,
http_bypass_fqdn => '',
- dns_bypass_ip => '',
- dns_bypass_ip6 => '',
- dns_bypass_ttl => -1,
+ dns_bypass_ip => 'hokeypokey',
+ dns_bypass_ttl => 10,
ccr_dns_ttl => 3600,
global_max_mbps => 0,
global_max_tps => 0,
- long_desc => 'test-ds3 long_desc',
- long_desc_1 => 'test-ds3 long_desc_1',
- long_desc_2 => 'test-ds3 long_desc_2',
+ long_desc => 'target-ds1 long_desc',
+ long_desc_1 => 'target-ds1 long_desc_1',
+ long_desc_2 => 'target-ds1 long_desc_2',
max_dns_answers => 0,
protocol => 0,
- org_server_fqdn => 'http://test-ds3.edge',
- info_url => 'http://test-ds3.edge/info_url.html',
+ org_server_fqdn => 'http://target-ds1.edge',
+ info_url => 'http://target-ds1.edge/info_url.html',
miss_lat => '41.881944',
miss_long => '-87.627778',
check_path => '/crossdomain.xml',
- type => 9,
+ type => 21,
profile => 1,
cdn_id => 1,
- display_name => 'test-ds3-displayname',
+ ipv6_routing_enabled => 1,
+ protocol => 1,
+ display_name => 'target-ds1-displayname',
initial_dispersion => 1,
- geo_provider => 0,
- regional_geo_blocking => 0,
- ipv6_routing_enabled => 0,
- logs_enabled => 0,
+ regional_geo_blocking => 1,
},
},
- ## id => 11
- ds_cdn4 => {
+ ## id => 5
+ target_ds2 => {
new => 'Deliveryservice',
using => {
id => 11,
- xml_id => 'test-ds4',
+ xml_id => 'steering-target-ds2',
active => 1,
dscp => 40,
signed => 0,
qstring_ignore => 0,
geo_limit => 0,
http_bypass_fqdn => '',
- dns_bypass_ip => '',
- dns_bypass_ip6 => '',
- dns_bypass_ttl => -1,
+ dns_bypass_ip => 'hokeypokey',
+ dns_bypass_ttl => 10,
ccr_dns_ttl => 3600,
global_max_mbps => 0,
global_max_tps => 0,
- long_desc => 'test-ds4 long_desc',
- long_desc_1 => 'test-ds4 long_desc_1',
- long_desc_2 => 'test-ds4 long_desc_2',
+ long_desc => 'target-ds2 long_desc',
+ long_desc_1 => 'target-ds2 long_desc_1',
+ long_desc_2 => 'target-ds2 long_desc_2',
max_dns_answers => 0,
protocol => 0,
- org_server_fqdn => 'http://test-ds4.edge',
- info_url => 'http://test-ds4.edge/info_url.html',
+ org_server_fqdn => 'http://target-ds2.edge',
+ info_url => 'http://target-ds2.edge/info_url.html',
miss_lat => '41.881944',
miss_long => '-87.627778',
check_path => '/crossdomain.xml',
- type => 9,
+ type => 21,
profile => 1,
cdn_id => 1,
- display_name => 'test-ds4-displayname',
+ ipv6_routing_enabled => 1,
+ protocol => 1,
+ display_name => 'target-ds2-displayname',
initial_dispersion => 1,
- geo_provider => 0,
- regional_geo_blocking => 0,
- ipv6_routing_enabled => 0,
- logs_enabled => 1,
+ regional_geo_blocking => 1,
},
},
- ds_dns => {
+ ## id => 6
+ target_ds3 => {
new => 'Deliveryservice',
using => {
id => 12,
- xml_id => 'test-ds5',
+ xml_id => 'steering-target-ds3',
active => 1,
dscp => 40,
signed => 0,
qstring_ignore => 0,
geo_limit => 0,
http_bypass_fqdn => '',
- dns_bypass_ip => '',
- dns_bypass_ip6 => '',
- dns_bypass_ttl => -1,
+ dns_bypass_ip => 'hokeypokey',
+ dns_bypass_ttl => 10,
ccr_dns_ttl => 3600,
global_max_mbps => 0,
global_max_tps => 0,
- long_desc => 'test-ds5 long_desc',
- long_desc_1 => 'test-ds5 long_desc_1',
- long_desc_2 => 'test-ds5 long_desc_2',
+ long_desc => 'target-ds3 long_desc',
+ long_desc_1 => 'target-ds3 long_desc_1',
+ long_desc_2 => 'target-ds3 long_desc_2',
max_dns_answers => 0,
protocol => 0,
- org_server_fqdn => 'http://test-ds5.edge',
- info_url => 'http://test-ds5.edge/info_url.html',
+ org_server_fqdn => 'http://target-ds3.edge',
+ info_url => 'http://target-ds3.edge/info_url.html',
miss_lat => '41.881944',
miss_long => '-87.627778',
check_path => '/crossdomain.xml',
- type => 7,
- profile => 3,
+ type => 21,
+ profile => 1,
cdn_id => 1,
- display_name => 'test-ds5-displayname',
+ ipv6_routing_enabled => 1,
+ protocol => 1,
+ display_name => 'target-ds3-displayname',
initial_dispersion => 1,
- geo_provider => 0,
- regional_geo_blocking => 0,
- ipv6_routing_enabled => 0,
- logs_enabled => 0,
+ regional_geo_blocking => 1,
},
},
- ds_http_no_cache => {
+ ## id => 7
+ target_ds4 => {
new => 'Deliveryservice',
using => {
id => 13,
- xml_id => 'test-ds6',
+ xml_id => 'steering-target-ds4',
active => 1,
dscp => 40,
signed => 0,
qstring_ignore => 0,
geo_limit => 0,
http_bypass_fqdn => '',
- dns_bypass_ip => '',
- dns_bypass_ip6 => '',
- dns_bypass_ttl => -1,
+ dns_bypass_ip => 'hokeypokey',
+ dns_bypass_ttl => 10,
ccr_dns_ttl => 3600,
global_max_mbps => 0,
global_max_tps => 0,
- long_desc => 'test-ds6 long_desc',
- long_desc_1 => 'test-ds6 long_desc_1',
- long_desc_2 => 'test-ds6 long_desc_2',
+ long_desc => 'target-ds4 long_desc',
+ long_desc_1 => 'target-ds4 long_desc_1',
+ long_desc_2 => 'target-ds4 long_desc_2',
max_dns_answers => 0,
protocol => 0,
- org_server_fqdn => 'http://test-ds6.edge',
- info_url => 'http://test-ds6.edge/info_url.html',
+ org_server_fqdn => 'http://target-ds4.edge',
+ info_url => 'http://target-ds4.edge/info_url.html',
miss_lat => '41.881944',
miss_long => '-87.627778',
check_path => '/crossdomain.xml',
- type => 9,
- profile => 3,
+ type => 21,
+ profile => 1,
cdn_id => 1,
- display_name => 'test-ds6-displayname',
+ ipv6_routing_enabled => 1,
+ protocol => 1,
+ display_name => 'target-ds4-displayname',
initial_dispersion => 1,
- geo_provider => 0,
- regional_geo_blocking => 0,
- ipv6_routing_enabled => 0,
- logs_enabled => 0,
+ regional_geo_blocking => 1,
},
},
);
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/68fb6859/traffic_ops/app/lib/Fixtures/DeliveryserviceServer.pm
----------------------------------------------------------------------
diff --git a/traffic_ops/app/lib/Fixtures/DeliveryserviceServer.pm b/traffic_ops/app/lib/Fixtures/DeliveryserviceServer.pm
index 3266e35..7f61b8a 100644
--- a/traffic_ops/app/lib/Fixtures/DeliveryserviceServer.pm
+++ b/traffic_ops/app/lib/Fixtures/DeliveryserviceServer.pm
@@ -21,43 +21,43 @@ my %definition_for = (
test_ds1_server_edge1 => {
new => 'DeliveryserviceServer',
using => {
- deliveryservice => 8,
+ deliveryservice => 1,
server => 1,
},
},
test_ds1_server_edge13 => {
new => 'DeliveryserviceServer',
using => {
- deliveryservice => 8,
- server => 3,
+ deliveryservice => 1,
+ server => 13,
},
},
test_ds1_server_mid1 => {
new => 'DeliveryserviceServer',
using => {
- deliveryservice => 8,
- server => 4,
+ deliveryservice => 1,
+ server => 2,
},
},
test_ds2_server_edge1 => {
new => 'DeliveryserviceServer',
using => {
- deliveryservice => 9,
- server => 2,
+ deliveryservice => 2,
+ server => 7,
},
},
test_ds2_server_mid1 => {
new => 'DeliveryserviceServer',
using => {
- deliveryservice => 9,
- server => 5,
+ deliveryservice => 2,
+ server => 8,
},
},
test_ds5_server_edge14 => {
new => 'DeliveryserviceServer',
using => {
deliveryservice => 5,
- server => 12,
+ server => 14,
},
},
test_ds5_server_edge15 => {
@@ -89,7 +89,8 @@ sub get_definition {
}
sub all_fixture_names {
- return keys %definition_for;
+ # sort by db name to guarantee insertion order
+ return (sort { $definition_for{$a}{using}{deliveryservice} cmp $definition_for{$b}{using}{deliveryservice} } keys %definition_for);
}
__PACKAGE__->meta->make_immutable;
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/68fb6859/traffic_ops/app/lib/Fixtures/DeliveryserviceTmuser.pm
----------------------------------------------------------------------
diff --git a/traffic_ops/app/lib/Fixtures/DeliveryserviceTmuser.pm b/traffic_ops/app/lib/Fixtures/DeliveryserviceTmuser.pm
index f6116bc..d27e932 100644
--- a/traffic_ops/app/lib/Fixtures/DeliveryserviceTmuser.pm
+++ b/traffic_ops/app/lib/Fixtures/DeliveryserviceTmuser.pm
@@ -21,22 +21,22 @@ my %definition_for = (
admin => {
new => 'DeliveryserviceTmuser',
using => {
- deliveryservice => 8,
+ deliveryservice => 1,
tm_user_id => 1,
},
},
portal_ds1 => {
new => 'DeliveryserviceTmuser',
using => {
- deliveryservice => 8,
- tm_user_id => 5,
+ deliveryservice => 1,
+ tm_user_id => 2,
},
},
ds_steering_user1 => {
new => 'DeliveryserviceTmuser',
using => {
deliveryservice => 1,
- tm_user_id => 6,
+ tm_user_id => 7,
},
},
ds_steering_user2 => {
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/68fb6859/traffic_ops/app/lib/Fixtures/TmUser.pm
----------------------------------------------------------------------
diff --git a/traffic_ops/app/lib/Fixtures/TmUser.pm b/traffic_ops/app/lib/Fixtures/TmUser.pm
index 6f70947..4b18fa7 100644
--- a/traffic_ops/app/lib/Fixtures/TmUser.pm
+++ b/traffic_ops/app/lib/Fixtures/TmUser.pm
@@ -22,12 +22,12 @@ use Digest::SHA1 qw(sha1_hex);
my $local_passwd = sha1_hex('password');
my %definition_for = (
- ## id => 1
admin => {
new => 'TmUser',
using => {
+ id => 1,
username => 'admin',
- role => 1,
+ role => 4,
uid => '1',
gid => '1',
local_passwd => $local_passwd,
@@ -46,60 +46,60 @@ my %definition_for = (
registration_sent => '1999-01-01 00:00:00',
},
},
- ## id => 2
- codebig => {
+ portal => {
new => 'TmUser',
using => {
- username => 'codebig',
+ id => 2,
+ username => 'portal',
role => 6,
uid => '1',
gid => '1',
local_passwd => $local_passwd,
confirm_local_passwd => $local_passwd,
- full_name => 'The Codebig User',
- email => 'codebig@kabletown.com',
+ full_name => 'The Portal User',
+ email => 'portal@kabletown.com',
new_user => '1',
- address_line1 => 'address_line7',
- address_line2 => 'address_line8',
+ address_line1 => 'address_line3',
+ address_line2 => 'address_line4',
city => 'city',
state_or_province => 'state_or_province',
- phone_number => '444-444-4444',
- postal_code => '80124',
+ phone_number => '222-222-2222',
+ postal_code => '80122',
country => 'United States',
token => '',
registration_sent => '1999-01-01 00:00:00',
},
},
- ## id => 3
- federation => {
+ codebig => {
new => 'TmUser',
using => {
- username => 'federation',
- role => 3,
+ id => 3,
+ username => 'codebig',
+ role => 6,
uid => '1',
gid => '1',
local_passwd => $local_passwd,
confirm_local_passwd => $local_passwd,
- full_name => 'The federations User',
- email => 'federation@kabletown.com',
+ full_name => 'The Codebig User',
+ email => 'codebig@kabletown.com',
new_user => '1',
- address_line1 => 'address_line1',
- address_line2 => 'address_line2',
+ address_line1 => 'address_line7',
+ address_line2 => 'address_line8',
city => 'city',
state_or_province => 'state_or_province',
- phone_number => '333-333-3333',
- postal_code => '80123',
+ phone_number => '444-444-4444',
+ postal_code => '80124',
country => 'United States',
token => '',
registration_sent => '1999-01-01 00:00:00',
},
},
- ## id => 4
migrations => {
new => 'TmUser',
using => {
+ id => 4,
username => 'migration',
- role => 4,
+ role => 5,
uid => '1',
gid => '1',
local_passwd => $local_passwd,
@@ -118,36 +118,36 @@ my %definition_for = (
registration_sent => '1999-01-01 00:00:00',
},
},
- ## id => 5
- portal => {
+ federation => {
new => 'TmUser',
using => {
- username => 'portal',
- role => 6,
+ id => 5,
+ username => 'federation',
+ role => 7,
uid => '1',
gid => '1',
local_passwd => $local_passwd,
confirm_local_passwd => $local_passwd,
- full_name => 'The Portal User',
- email => 'portal@kabletown.com',
+ full_name => 'The federations User',
+ email => 'federation@kabletown.com',
new_user => '1',
- address_line1 => 'address_line3',
- address_line2 => 'address_line4',
+ address_line1 => 'address_line1',
+ address_line2 => 'address_line2',
city => 'city',
state_or_province => 'state_or_province',
- phone_number => '222-222-2222',
- postal_code => '80122',
+ phone_number => '333-333-3333',
+ postal_code => '80123',
country => 'United States',
token => '',
registration_sent => '1999-01-01 00:00:00',
},
},
- ## id => 6
steering1 => {
new => 'TmUser',
using => {
+ id => 6,
username => 'steering1',
- role => 8,
+ role => 7,
uid => '1',
gid => '1',
local_passwd => $local_passwd,
@@ -166,12 +166,12 @@ my %definition_for = (
registration_sent => '1999-01-01 00:00:00',
},
},
- ## id => 7
steering2 => {
new => 'TmUser',
using => {
+ id => 7,
username => 'steering2',
- role => 8,
+ role => 7,
uid => '1',
gid => '1',
local_passwd => $local_passwd,
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/68fb6859/traffic_ops/app/t/api/1.1/deliveryserviceserver.t
----------------------------------------------------------------------
diff --git a/traffic_ops/app/t/api/1.1/deliveryserviceserver.t b/traffic_ops/app/t/api/1.1/deliveryserviceserver.t
index 8a9af0e..42fa37a 100644
--- a/traffic_ops/app/t/api/1.1/deliveryserviceserver.t
+++ b/traffic_ops/app/t/api/1.1/deliveryserviceserver.t
@@ -42,7 +42,7 @@ ok $t->post_ok( '/login', => form => { u => 'portal', p => Test::TestHelper::ADM
->or( sub { diag $t->tx->res->content->asset->{content}; } );
$t->get_ok("/api/1.1/deliveryserviceserver.json")->status_is(200)->or( sub { diag $t->tx->res->content->asset->{content}; } )
- ->json_is( "/response/0/server", "1" )->json_is( "/response/0/deliveryService", "8" )->json_is( "/limit", "20" )
+ ->json_is( "/response/0/server", "1" )->json_is( "/response/0/deliveryService", "1" )->json_is( "/limit", "20" )
->json_is( "/orderby", "deliveryservice" );
ok $t->get_ok('/logout')->status_is(302)->or( sub { diag $t->tx->res->content->asset->{content}; } );