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:33 UTC
[18/40] incubator-trafficcontrol git commit: fixed data alignment and
t/staticdnsentry.t
fixed data alignment and t/staticdnsentry.t
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/commit/a2f026a3
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/tree/a2f026a3
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/diff/a2f026a3
Branch: refs/heads/psql-rebase
Commit: a2f026a3f5836fa8b4cf7fa0e05f135b4cec5046
Parents: a430a00
Author: Dewayne Richardson <de...@apache.org>
Authored: Thu Nov 17 13:17:48 2016 -0700
Committer: Dan Kirkwood <da...@gmail.com>
Committed: Mon Nov 21 12:04:09 2016 -0700
----------------------------------------------------------------------
traffic_ops/app/lib/Fixtures/Deliveryservice.pm | 26 +-
traffic_ops/app/lib/Fixtures/Profile.pm | 12 +-
.../app/lib/Fixtures/ProfileParameter.pm | 238 +++++++++----------
traffic_ops/app/lib/Fixtures/Server.pm | 30 +--
traffic_ops/app/lib/Fixtures/Staticdnsentry.pm | 10 +-
traffic_ops/app/t/deliveryservice.t | 8 +-
traffic_ops/app/t/purge.t | 4 +-
traffic_ops/app/t/server.t | 10 +-
traffic_ops/app/t/staticdnsentry.t | 2 +-
9 files changed, 170 insertions(+), 170 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/a2f026a3/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 d9f5a34..290c211 100644
--- a/traffic_ops/app/lib/Fixtures/Deliveryservice.pm
+++ b/traffic_ops/app/lib/Fixtures/Deliveryservice.pm
@@ -47,7 +47,7 @@ my %definition_for = (
miss_long => '-87.627778',
check_path => '/crossdomain.xml',
type => 21,
- profile => 1,
+ profile => 100,
cdn_id => 1,
ipv6_routing_enabled => 1,
protocol => 1,
@@ -85,7 +85,7 @@ my %definition_for = (
miss_long => '-87.627778',
check_path => '/crossdomain.xml',
type => 9,
- profile => 1,
+ profile => 100,
cdn_id => 1,
display_name => 'test-ds2-displayname',
initial_dispersion => 1,
@@ -123,7 +123,7 @@ my %definition_for = (
miss_long => '-87.627778',
check_path => '/crossdomain.xml',
type => 9,
- profile => 1,
+ profile => 100,
cdn_id => 1,
display_name => 'test-ds3-displayname',
initial_dispersion => 1,
@@ -161,7 +161,7 @@ my %definition_for = (
miss_long => '-87.627778',
check_path => '/crossdomain.xml',
type => 9,
- profile => 1,
+ profile => 100,
cdn_id => 1,
display_name => 'test-ds4-displayname',
initial_dispersion => 1,
@@ -199,7 +199,7 @@ my %definition_for = (
miss_long => '-87.627778',
check_path => '/crossdomain.xml',
type => 7,
- profile => 3,
+ profile => 300,
cdn_id => 1,
display_name => 'test-ds5-displayname',
initial_dispersion => 1,
@@ -237,7 +237,7 @@ my %definition_for = (
miss_long => '-87.627778',
check_path => '/crossdomain.xml',
type => 9,
- profile => 3,
+ profile => 300,
cdn_id => 1,
display_name => 'test-ds6-displayname',
initial_dispersion => 1,
@@ -274,7 +274,7 @@ my %definition_for = (
miss_long => '-87.627778',
check_path => '/crossdomain.xml',
type => 21,
- profile => 1,
+ profile => 100,
cdn_id => 1,
ipv6_routing_enabled => 1,
protocol => 1,
@@ -310,7 +310,7 @@ my %definition_for = (
miss_long => '-87.627778',
check_path => '/crossdomain.xml',
type => 21,
- profile => 1,
+ profile => 100,
cdn_id => 1,
ipv6_routing_enabled => 1,
protocol => 1,
@@ -346,7 +346,7 @@ my %definition_for = (
miss_long => '-87.627778',
check_path => '/crossdomain.xml',
type => 21,
- profile => 1,
+ profile => 100,
cdn_id => 1,
ipv6_routing_enabled => 1,
protocol => 1,
@@ -382,7 +382,7 @@ my %definition_for = (
miss_long => '-87.627778',
check_path => '/crossdomain.xml',
type => 21,
- profile => 1,
+ profile => 100,
cdn_id => 1,
ipv6_routing_enabled => 1,
protocol => 1,
@@ -418,7 +418,7 @@ my %definition_for = (
miss_long => '-87.627778',
check_path => '/crossdomain.xml',
type => 21,
- profile => 1,
+ profile => 100,
cdn_id => 1,
ipv6_routing_enabled => 1,
protocol => 1,
@@ -454,7 +454,7 @@ my %definition_for = (
miss_long => '-87.627778',
check_path => '/crossdomain.xml',
type => 21,
- profile => 1,
+ profile => 100,
cdn_id => 1,
ipv6_routing_enabled => 1,
protocol => 1,
@@ -490,7 +490,7 @@ my %definition_for = (
miss_long => '-87.627778',
check_path => '/crossdomain.xml',
type => 21,
- profile => 1,
+ profile => 100,
cdn_id => 1,
ipv6_routing_enabled => 1,
protocol => 1,
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/a2f026a3/traffic_ops/app/lib/Fixtures/Profile.pm
----------------------------------------------------------------------
diff --git a/traffic_ops/app/lib/Fixtures/Profile.pm b/traffic_ops/app/lib/Fixtures/Profile.pm
index f4765b3..4a46b6f 100644
--- a/traffic_ops/app/lib/Fixtures/Profile.pm
+++ b/traffic_ops/app/lib/Fixtures/Profile.pm
@@ -21,7 +21,7 @@ my %definition_for = (
EDGE1 => {
new => 'Profile',
using => {
- id => 1,
+ id => 100,
name => 'EDGE1',
description => 'edge description',
},
@@ -29,7 +29,7 @@ my %definition_for = (
MID1 => {
new => 'Profile',
using => {
- id => 2,
+ id => 200,
name => 'MID1',
description => 'mid description',
},
@@ -37,7 +37,7 @@ my %definition_for = (
CCR1 => {
new => 'Profile',
using => {
- id => 3,
+ id => 300,
name => 'CCR1',
description => 'ccr description',
},
@@ -45,7 +45,7 @@ my %definition_for = (
RIAK1 => {
new => 'Profile',
using => {
- id => 5,
+ id => 500,
name => 'RIAK1',
description => 'riak description',
},
@@ -53,7 +53,7 @@ my %definition_for = (
RASCAL1 => {
new => 'Profile',
using => {
- id => 6,
+ id => 600,
name => 'RASCAL1',
description => 'rascal description',
},
@@ -61,7 +61,7 @@ my %definition_for = (
RASCAL2 => {
new => 'Profile',
using => {
- id => 7,
+ id => 700,
name => 'RASCAL2',
description => 'rascal2 description',
},
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/a2f026a3/traffic_ops/app/lib/Fixtures/ProfileParameter.pm
----------------------------------------------------------------------
diff --git a/traffic_ops/app/lib/Fixtures/ProfileParameter.pm b/traffic_ops/app/lib/Fixtures/ProfileParameter.pm
index e5a306e..e2503ee 100644
--- a/traffic_ops/app/lib/Fixtures/ProfileParameter.pm
+++ b/traffic_ops/app/lib/Fixtures/ProfileParameter.pm
@@ -22,833 +22,833 @@ my %definition_for = (
domain_name => {
new => 'ProfileParameter',
using => {
- profile => 1,
+ profile => 100,
parameter => 3,
},
},
domain_name2 => {
new => 'ProfileParameter',
using => {
- profile => 2,
+ profile => 200,
parameter => 3,
},
},
domain_name3 => {
new => 'ProfileParameter',
using => {
- profile => 3,
+ profile => 300,
parameter => 3,
},
},
domain_name5 => {
new => 'ProfileParameter',
using => {
- profile => 5,
+ profile => 500,
parameter => 3,
},
},
domain_name6 => {
new => 'ProfileParameter',
using => {
- profile => 6,
+ profile => 600,
parameter => 3,
},
},
domain_name7 => {
new => 'ProfileParameter',
using => {
- profile => 7,
+ profile => 700,
parameter => 3,
},
},
rascal_properties1 => {
new => 'ProfileParameter',
using => {
- profile => 2,
+ profile => 200,
parameter => 4,
},
},
rascal_properties2 => {
new => 'ProfileParameter',
using => {
- profile => 2,
+ profile => 200,
parameter => 5,
},
},
rascal_properties2 => {
new => 'ProfileParameter',
using => {
- profile => 2,
+ profile => 200,
parameter => 6,
},
},
edge1_key0 => {
new => 'ProfileParameter',
using => {
- profile => 1,
+ profile => 100,
parameter => 7,
},
},
edge1_key1 => {
new => 'ProfileParameter',
using => {
- profile => 1,
+ profile => 100,
parameter => 8,
},
},
edge1_key2 => {
new => 'ProfileParameter',
using => {
- profile => 1,
+ profile => 100,
parameter => 9,
},
},
edge1_key3 => {
new => 'ProfileParameter',
using => {
- profile => 1,
+ profile => 100,
parameter => 10,
},
},
edge1_key4 => {
new => 'ProfileParameter',
using => {
- profile => 1,
+ profile => 100,
parameter => 11,
},
},
edge1_key5 => {
new => 'ProfileParameter',
using => {
- profile => 1,
+ profile => 100,
parameter => 12,
},
},
edge1_key6 => {
new => 'ProfileParameter',
using => {
- profile => 1,
+ profile => 100,
parameter => 13,
},
},
edge1_key7 => {
new => 'ProfileParameter',
using => {
- profile => 1,
+ profile => 100,
parameter => 14,
},
},
edge1_key8 => {
new => 'ProfileParameter',
using => {
- profile => 1,
+ profile => 100,
parameter => 15,
},
},
edge1_key9 => {
new => 'ProfileParameter',
using => {
- profile => 1,
+ profile => 100,
parameter => 16,
},
},
edge1_key10 => {
new => 'ProfileParameter',
using => {
- profile => 1,
+ profile => 100,
parameter => 17,
},
},
edge1_key11 => {
new => 'ProfileParameter',
using => {
- profile => 1,
+ profile => 100,
parameter => 18,
},
},
edge1_key12 => {
new => 'ProfileParameter',
using => {
- profile => 1,
+ profile => 100,
parameter => 19,
},
},
edge1_key13 => {
new => 'ProfileParameter',
using => {
- profile => 1,
+ profile => 100,
parameter => 20,
},
},
edge1_key14 => {
new => 'ProfileParameter',
using => {
- profile => 1,
+ profile => 100,
parameter => 21,
},
},
edge1_key15 => {
new => 'ProfileParameter',
using => {
- profile => 1,
+ profile => 100,
parameter => 22,
},
},
'edge1_url_sig_cdl-c2.config_location' => {
new => 'ProfileParameter',
using => {
- profile => 1,
+ profile => 100,
parameter => 23,
},
},
'edge1_error_url' => {
new => 'ProfileParameter',
using => {
- profile => 1,
+ profile => 100,
parameter => 24,
},
},
'edge1_CONFIG-proxy.config.allocator.debug_filter' => {
new => 'ProfileParameter',
using => {
- profile => 1,
+ profile => 100,
parameter => 25,
},
},
'edge1_CONFIG-proxy.config.allocator.enable_reclaim' => {
new => 'ProfileParameter',
using => {
- profile => 1,
+ profile => 100,
parameter => 26,
},
},
'edge1_CONFIG-proxy.config.allocator.max_overage' => {
new => 'ProfileParameter',
using => {
- profile => 1,
+ profile => 100,
parameter => 27,
},
},
'edge1_CONFIG-proxy.config.diags.show_location' => {
new => 'ProfileParameter',
using => {
- profile => 1,
+ profile => 100,
parameter => 28,
},
},
'edge1_CONFIG-proxy.config.http.cache.allow_empty_doc' => {
new => 'ProfileParameter',
using => {
- profile => 1,
+ profile => 100,
parameter => 29,
},
},
'LOCAL-proxy.config.cache.interim.storage' => {
new => 'ProfileParameter',
using => {
- profile => 1,
+ profile => 100,
parameter => 30,
},
},
'edge1_CONFIG-proxy.config.http.parent_proxy.file' => {
new => 'ProfileParameter',
using => {
- profile => 1,
+ profile => 100,
parameter => 31,
},
},
'edge1_12M_location' => {
new => 'ProfileParameter',
using => {
- profile => 1,
+ profile => 100,
parameter => 32,
},
},
'edge1_cacheurl_location' => {
new => 'ProfileParameter',
using => {
- profile => 1,
+ profile => 100,
parameter => 33,
},
},
'edge1_ip_allow_location' => {
new => 'ProfileParameter',
using => {
- profile => 1,
+ profile => 100,
parameter => 34,
},
},
'edge1_astats_over_http.so' => {
new => 'ProfileParameter',
using => {
- profile => 1,
+ profile => 100,
parameter => 35,
},
},
'edge1_crontab_root_location' => {
new => 'ProfileParameter',
using => {
- profile => 1,
+ profile => 100,
parameter => 36,
},
},
'edge1_hdr_rw_cdl-c2.config_location' => {
new => 'ProfileParameter',
using => {
- profile => 1,
+ profile => 100,
parameter => 37,
},
},
'edge1_50-ats.rules_location' => {
new => 'ProfileParameter',
using => {
- profile => 1,
+ profile => 100,
parameter => 38,
},
},
'edge1_parent.config_location' => {
new => 'ProfileParameter',
using => {
- profile => 1,
+ profile => 100,
parameter => 39,
},
},
'edge1_remap.config_location' => {
new => 'ProfileParameter',
using => {
- profile => 1,
+ profile => 100,
parameter => 40,
},
},
'edge1_drop_qstring.config_location' => {
new => 'ProfileParameter',
using => {
- profile => 1,
+ profile => 100,
parameter => 41,
},
},
'edge1_LogFormat.Format' => {
new => 'ProfileParameter',
using => {
- profile => 1,
+ profile => 100,
parameter => 42,
},
},
'edge1_LogFormat.Name' => {
new => 'ProfileParameter',
using => {
- profile => 1,
+ profile => 100,
parameter => 43,
},
},
'edge1_LogObject.Format' => {
new => 'ProfileParameter',
using => {
- profile => 1,
+ profile => 100,
parameter => 44,
},
},
'edge1_LogObject.Filename' => {
new => 'ProfileParameter',
using => {
- profile => 1,
+ profile => 100,
parameter => 45,
},
},
'edge1_cache.config_location' => {
new => 'ProfileParameter',
using => {
- profile => 1,
+ profile => 100,
parameter => 46,
},
},
'edge1_CONFIG-proxy.config.cache.control.filename' => {
new => 'ProfileParameter',
using => {
- profile => 1,
+ profile => 100,
parameter => 47,
},
},
'edge1_regex_revalidate.so' => {
new => 'ProfileParameter',
using => {
- profile => 1,
+ profile => 100,
parameter => 48,
},
},
'edge1_regex_revalidate.config_location' => {
new => 'ProfileParameter',
using => {
- profile => 1,
+ profile => 100,
parameter => 49,
},
},
'edge1_hosting.config_location' => {
new => 'ProfileParameter',
using => {
- profile => 1,
+ profile => 100,
parameter => 50,
},
},
'edge1_volume.config_location' => {
new => 'ProfileParameter',
using => {
- profile => 1,
+ profile => 100,
parameter => 51,
},
},
'edge1_allow_ip' => {
new => 'ProfileParameter',
using => {
- profile => 1,
+ profile => 100,
parameter => 52,
},
},
'edge1_allow_ip6' => {
new => 'ProfileParameter',
using => {
- profile => 1,
+ profile => 100,
parameter => 53,
},
},
'edge1_record_types' => {
new => 'ProfileParameter',
using => {
- profile => 1,
+ profile => 100,
parameter => 54,
},
},
'edge1_astats.config_location' => {
new => 'ProfileParameter',
using => {
- profile => 1,
+ profile => 100,
parameter => 55,
},
},
'edge1_astats.config_path' => {
new => 'ProfileParameter',
using => {
- profile => 1,
+ profile => 100,
parameter => 56,
},
},
'edge1_storage.config_location' => {
new => 'ProfileParameter',
using => {
- profile => 1,
+ profile => 100,
parameter => 57,
},
},
'edge1_Drive_Prefix' => {
new => 'ProfileParameter',
using => {
- profile => 1,
+ profile => 100,
parameter => 58,
},
},
'edge1_Drive_Letters' => {
new => 'ProfileParameter',
using => {
- profile => 1,
+ profile => 100,
parameter => 59,
},
},
'edge1_Disk_Volume' => {
new => 'ProfileParameter',
using => {
- profile => 1,
+ profile => 100,
parameter => 60,
},
},
'edge1_CONFIG-proxy.config.hostdb.storage_size' => {
new => 'ProfileParameter',
using => {
- profile => 1,
+ profile => 100,
parameter => 61,
},
},
mid1_key0 => {
new => 'ProfileParameter',
using => {
- profile => 2,
+ profile => 200,
parameter => 7,
},
},
mid1_key1 => {
new => 'ProfileParameter',
using => {
- profile => 2,
+ profile => 200,
parameter => 8,
},
},
mid1_key2 => {
new => 'ProfileParameter',
using => {
- profile => 2,
+ profile => 200,
parameter => 9,
},
},
mid1_key3 => {
new => 'ProfileParameter',
using => {
- profile => 2,
+ profile => 200,
parameter => 10,
},
},
mid1_key4 => {
new => 'ProfileParameter',
using => {
- profile => 2,
+ profile => 200,
parameter => 11,
},
},
mid1_key5 => {
new => 'ProfileParameter',
using => {
- profile => 2,
+ profile => 200,
parameter => 12,
},
},
mid1_key6 => {
new => 'ProfileParameter',
using => {
- profile => 2,
+ profile => 200,
parameter => 13,
},
},
mid1_key7 => {
new => 'ProfileParameter',
using => {
- profile => 2,
+ profile => 200,
parameter => 14,
},
},
mid1_key8 => {
new => 'ProfileParameter',
using => {
- profile => 2,
+ profile => 200,
parameter => 15,
},
},
mid1_key9 => {
new => 'ProfileParameter',
using => {
- profile => 2,
+ profile => 200,
parameter => 16,
},
},
mid1_key10 => {
new => 'ProfileParameter',
using => {
- profile => 2,
+ profile => 200,
parameter => 17,
},
},
mid1_key11 => {
new => 'ProfileParameter',
using => {
- profile => 2,
+ profile => 200,
parameter => 18,
},
},
mid1_key12 => {
new => 'ProfileParameter',
using => {
- profile => 2,
+ profile => 200,
parameter => 19,
},
},
mid1_key13 => {
new => 'ProfileParameter',
using => {
- profile => 2,
+ profile => 200,
parameter => 20,
},
},
mid1_key14 => {
new => 'ProfileParameter',
using => {
- profile => 2,
+ profile => 200,
parameter => 21,
},
},
mid1_key15 => {
new => 'ProfileParameter',
using => {
- profile => 2,
+ profile => 200,
parameter => 22,
},
},
'mid1_url_sig_cdl-c2.config_location' => {
new => 'ProfileParameter',
using => {
- profile => 2,
+ profile => 200,
parameter => 23,
},
},
'mid1_error_url' => {
new => 'ProfileParameter',
using => {
- profile => 2,
+ profile => 200,
parameter => 24,
},
},
'mid1_CONFIG-proxy.config.allocator.debug_filter' => {
new => 'ProfileParameter',
using => {
- profile => 2,
+ profile => 200,
parameter => 25,
},
},
'mid1_CONFIG-proxy.config.allocator.enable_reclaim' => {
new => 'ProfileParameter',
using => {
- profile => 2,
+ profile => 200,
parameter => 26,
},
},
'mid1_CONFIG-proxy.config.allocator.max_overage' => {
new => 'ProfileParameter',
using => {
- profile => 2,
+ profile => 200,
parameter => 27,
},
},
'mid1_CONFIG-proxy.config.diags.show_location' => {
new => 'ProfileParameter',
using => {
- profile => 2,
+ profile => 200,
parameter => 28,
},
},
'mid1_CONFIG-proxy.config.http.cache.allow_empty_doc' => {
new => 'ProfileParameter',
using => {
- profile => 2,
+ profile => 200,
parameter => 29,
},
},
'LOCAL-proxy.config.cache.interim.storage' => {
new => 'ProfileParameter',
using => {
- profile => 2,
+ profile => 200,
parameter => 30,
},
},
'mid1_CONFIG-proxy.config.http.parent_proxy.file' => {
new => 'ProfileParameter',
using => {
- profile => 2,
+ profile => 200,
parameter => 31,
},
},
'mid1_12M_location' => {
new => 'ProfileParameter',
using => {
- profile => 2,
+ profile => 200,
parameter => 32,
},
},
'mid1_cacheurl_location' => {
new => 'ProfileParameter',
using => {
- profile => 2,
+ profile => 200,
parameter => 33,
},
},
'mid1_ip_allow_location' => {
new => 'ProfileParameter',
using => {
- profile => 2,
+ profile => 200,
parameter => 34,
},
},
'mid1_astats_over_http.so' => {
new => 'ProfileParameter',
using => {
- profile => 2,
+ profile => 200,
parameter => 35,
},
},
'mid1_crontab_root_location' => {
new => 'ProfileParameter',
using => {
- profile => 2,
+ profile => 200,
parameter => 36,
},
},
'mid1_hdr_rw_cdl-c2.config_location' => {
new => 'ProfileParameter',
using => {
- profile => 2,
+ profile => 200,
parameter => 37,
},
},
'mid1_50-ats.rules_location' => {
new => 'ProfileParameter',
using => {
- profile => 2,
+ profile => 200,
parameter => 38,
},
},
'mid1_parent.config_location' => {
new => 'ProfileParameter',
using => {
- profile => 2,
+ profile => 200,
parameter => 39,
},
},
'mid1_remap.config_location' => {
new => 'ProfileParameter',
using => {
- profile => 2,
+ profile => 200,
parameter => 40,
},
},
'mid1_drop_qstring.config_location' => {
new => 'ProfileParameter',
using => {
- profile => 2,
+ profile => 200,
parameter => 41,
},
},
'mid1_LogFormat.Format' => {
new => 'ProfileParameter',
using => {
- profile => 2,
+ profile => 200,
parameter => 42,
},
},
'mid1_LogFormat.Name' => {
new => 'ProfileParameter',
using => {
- profile => 2,
+ profile => 200,
parameter => 43,
},
},
'mid1_LogObject.Format' => {
new => 'ProfileParameter',
using => {
- profile => 2,
+ profile => 200,
parameter => 44,
},
},
'mid1_LogObject.Filename' => {
new => 'ProfileParameter',
using => {
- profile => 2,
+ profile => 200,
parameter => 45,
},
},
'mid1_cache.config_location' => {
new => 'ProfileParameter',
using => {
- profile => 2,
+ profile => 200,
parameter => 46,
},
},
'mid1_CONFIG-proxy.config.cache.control.filename' => {
new => 'ProfileParameter',
using => {
- profile => 2,
+ profile => 200,
parameter => 47,
},
},
'mid1_regex_revalidate.so' => {
new => 'ProfileParameter',
using => {
- profile => 2,
+ profile => 200,
parameter => 48,
},
},
'mid1_regex_revalidate.config_location' => {
new => 'ProfileParameter',
using => {
- profile => 2,
+ profile => 200,
parameter => 49,
},
},
'mid1_hosting.config_location' => {
new => 'ProfileParameter',
using => {
- profile => 2,
+ profile => 200,
parameter => 50,
},
},
'mid1_volume.config_location' => {
new => 'ProfileParameter',
using => {
- profile => 2,
+ profile => 200,
parameter => 51,
},
},
'mid1_allow_ip' => {
new => 'ProfileParameter',
using => {
- profile => 2,
+ profile => 200,
parameter => 52,
},
},
'mid1_allow_ip6' => {
new => 'ProfileParameter',
using => {
- profile => 2,
+ profile => 200,
parameter => 53,
},
},
'mid1_record_types' => {
new => 'ProfileParameter',
using => {
- profile => 2,
+ profile => 200,
parameter => 54,
},
},
'mid1_astats.config_location' => {
new => 'ProfileParameter',
using => {
- profile => 2,
+ profile => 200,
parameter => 55,
},
},
'mid1_astats.config_path' => {
new => 'ProfileParameter',
using => {
- profile => 2,
+ profile => 200,
parameter => 56,
},
},
'mid1_storage.config_location' => {
new => 'ProfileParameter',
using => {
- profile => 2,
+ profile => 200,
parameter => 57,
},
},
'mid1_Drive_Prefix' => {
new => 'ProfileParameter',
using => {
- profile => 2,
+ profile => 200,
parameter => 58,
},
},
'mid1_Drive_Letters' => {
new => 'ProfileParameter',
using => {
- profile => 2,
+ profile => 200,
parameter => 59,
},
},
'mid1_Disk_Volume' => {
new => 'ProfileParameter',
using => {
- profile => 2,
+ profile => 200,
parameter => 60,
},
},
'mid1_CONFIG-proxy.config.hostdb.storage_size' => {
new => 'ProfileParameter',
using => {
- profile => 2,
+ profile => 200,
parameter => 61,
},
},
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/a2f026a3/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 f69aa86..cf0e5d5 100644
--- a/traffic_ops/app/lib/Fixtures/Server.pm
+++ b/traffic_ops/app/lib/Fixtures/Server.pm
@@ -47,7 +47,7 @@ my %definition_for = (
router_port_name => '',
type => 1,
status => 2,
- profile => 1,
+ profile => 100,
cdn_id => 1,
cachegroup => 3,
phys_location => 100,
@@ -82,7 +82,7 @@ my %definition_for = (
router_port_name => '',
type => 2,
status => 2,
- profile => 2,
+ profile => 200,
cdn_id => 1,
cachegroup => 1,
phys_location => 100,
@@ -117,7 +117,7 @@ my %definition_for = (
router_port_name => '',
type => 4,
status => 2,
- profile => 3,
+ profile => 300,
cdn_id => 2,
cachegroup => 1,
phys_location => 100,
@@ -152,7 +152,7 @@ my %definition_for = (
router_port_name => '',
type => 31,
status => 2,
- profile => 5,
+ profile => 500,
cdn_id => 1,
cachegroup => 1,
phys_location => 100,
@@ -187,7 +187,7 @@ my %definition_for = (
router_port_name => '',
type => 4,
status => 2,
- profile => 3,
+ profile => 300,
cdn_id => 2,
cachegroup => 1,
phys_location => 100,
@@ -222,7 +222,7 @@ my %definition_for = (
router_port_name => '',
type => 1,
status => 2,
- profile => 1,
+ profile => 100,
cdn_id => 1,
cachegroup => 3,
phys_location => 100,
@@ -257,7 +257,7 @@ my %definition_for = (
router_port_name => '',
type => 2,
status => 2,
- profile => 2,
+ profile => 200,
cdn_id => 2,
cachegroup => 2,
phys_location => 200,
@@ -292,7 +292,7 @@ my %definition_for = (
router_port_name => '',
type => 31,
status => 2,
- profile => 5,
+ profile => 500,
cdn_id => 1,
cachegroup => 1,
phys_location => 200,
@@ -327,7 +327,7 @@ my %definition_for = (
router_port_name => '',
type => 32,
status => 2,
- profile => 5,
+ profile => 500,
cdn_id => 1,
cachegroup => 1,
phys_location => 300,
@@ -362,7 +362,7 @@ my %definition_for = (
router_port_name => '',
type => 32,
status => 2,
- profile => 5,
+ profile => 500,
cdn_id => 1,
cachegroup => 1,
phys_location => 300,
@@ -397,7 +397,7 @@ my %definition_for = (
router_port_name => '',
type => 4,
status => 2,
- profile => 1,
+ profile => 100,
cdn_id => 1,
cachegroup => 3,
phys_location => 100,
@@ -432,7 +432,7 @@ my %definition_for = (
router_port_name => '',
type => 1,
status => 3,
- profile => 1,
+ profile => 100,
cdn_id => 1,
cachegroup => 3,
phys_location => 100,
@@ -467,7 +467,7 @@ my %definition_for = (
router_port_name => '',
type => 1,
status => 2,
- profile => 1,
+ profile => 100,
cdn_id => 1,
cachegroup => 9,
phys_location => 100,
@@ -502,7 +502,7 @@ my %definition_for = (
router_port_name => '',
type => 1,
status => 2,
- profile => 1,
+ profile => 100,
cdn_id => 1,
cachegroup => 9,
phys_location => 100,
@@ -537,7 +537,7 @@ my %definition_for = (
router_port_name => '',
type => 2,
status => 2,
- profile => 1,
+ profile => 100,
cdn_id => 1,
cachegroup => 8,
phys_location => 100,
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/a2f026a3/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 d43b223..d7866d6 100644
--- a/traffic_ops/app/lib/Fixtures/Staticdnsentry.pm
+++ b/traffic_ops/app/lib/Fixtures/Staticdnsentry.pm
@@ -21,7 +21,7 @@ my %definition_for = (
a_record_host => {
new => 'Staticdnsentry',
using => {
- id => 1,
+ id => 100,
host => 'A_RECORD_HOST',
address => '127.0.0.1',
type => 21,
@@ -32,10 +32,10 @@ my %definition_for = (
aaaa_record_host => {
new => 'Staticdnsentry',
using => {
- id => 2,
+ id => 200,
host => 'AAAA_RECORD_HOST',
address => '127.0.0.1',
- deliveryservice => 1,
+ deliveryservice => 100,
cachegroup => 1,
type => 22,
},
@@ -43,10 +43,10 @@ my %definition_for = (
cname_host => {
new => 'Staticdnsentry',
using => {
- id => 3,
+ id => 300,
host => 'CNAME_HOST',
address => '127.0.0.1',
- deliveryservice => 2,
+ deliveryservice => 200,
type => 23,
cachegroup => 2,
},
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/a2f026a3/traffic_ops/app/t/deliveryservice.t
----------------------------------------------------------------------
diff --git a/traffic_ops/app/t/deliveryservice.t b/traffic_ops/app/t/deliveryservice.t
index b1d47a0..e418945 100644
--- a/traffic_ops/app/t/deliveryservice.t
+++ b/traffic_ops/app/t/deliveryservice.t
@@ -78,7 +78,7 @@ ok $t->post_ok(
'ds.org_server_fqdn' => 'http://jvd.knutsel.com',
'ds.multi_site_origin' => '0',
'ds.multi_site_origin_algorithm' => '0',
- 'ds.profile' => '1',
+ 'ds.profile' => '100',
'ds.cdn_id' => '1',
'ds.qstring_ignore' => '0',
're_order_0' => '0',
@@ -128,7 +128,7 @@ ok $t->post_ok(
'ds.org_server_fqdn' => 'http://jvd-1.knutsel.com',
'ds.multi_site_origin' => '0',
'ds.multi_site_origin_algorithm' => '0',
- 'ds.profile' => '1',
+ 'ds.profile' => '100',
'ds.cdn_id' => '1',
'ds.qstring_ignore' => '0',
'ds.signed' => '0',
@@ -178,7 +178,7 @@ ok $t->post_ok(
'ds.org_server_fqdn' => 'http://jvd.knutsel.com',
'ds.multi_site_origin' => '0',
'ds.multi_site_origin_algorithm' => '0',
- 'ds.profile' => '1',
+ 'ds.profile' => '100',
'ds.cdn_id' => '1',
'ds.qstring_ignore' => '1',
'ds.signed' => '1',
@@ -258,7 +258,7 @@ ok $t->post_ok(
'ds.org_server_fqdn' => 'http://update.knutsel.com',
'ds.multi_site_origin' => '0',
'ds.multi_site_origin_algorithm' => '0',
- 'ds.profile' => '2',
+ 'ds.profile' => '200',
'ds.cdn_id' => '2',
'ds.qstring_ignore' => '0',
'ds.signed' => '0',
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/a2f026a3/traffic_ops/app/t/purge.t
----------------------------------------------------------------------
diff --git a/traffic_ops/app/t/purge.t b/traffic_ops/app/t/purge.t
index a74e2af..cd43a7f 100644
--- a/traffic_ops/app/t/purge.t
+++ b/traffic_ops/app/t/purge.t
@@ -46,7 +46,7 @@ ok $schema->resultset('Profile')->find( { name => 'EDGE1' } ), 'Profile edge1 ex
ok $schema->resultset('Deliveryservice')->find( { xml_id => 'test-ds1' } ), 'Deliveryservice test-ds1 exists?';
$t->post_ok( '/login', => form => { u => 'admin', p => 'password' } )->status_is(302)->or( sub { diag $t->tx->res->content->asset->{content}; } );
-my $q = 'SELECT deliveryservice.id,
+my $q = "SELECT deliveryservice.id,
deliveryservice.xml_id,
org_server_fqdn,
type,
@@ -55,7 +55,7 @@ my $q = 'SELECT deliveryservice.id,
FROM deliveryservice
JOIN profile ON profile.id = deliveryservice.profile
JOIN cdn ON cdn.id = deliveryservice.cdn_id
- WHERE deliveryservice.active = 1 ORDER BY RANDOM() LIMIT 1';
+ WHERE deliveryservice.active = 'true' ORDER BY RANDOM() LIMIT 1";
my $get_ds = $dbh->prepare($q);
$get_ds->execute();
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/a2f026a3/traffic_ops/app/t/server.t
----------------------------------------------------------------------
diff --git a/traffic_ops/app/t/server.t b/traffic_ops/app/t/server.t
index e18ead4..069d50a 100644
--- a/traffic_ops/app/t/server.t
+++ b/traffic_ops/app/t/server.t
@@ -41,7 +41,7 @@ Test::TestHelper->unload_core_data($schema);
#load core test data
Test::TestHelper->load_core_data($schema);
-my $q = 'select * from server where type = 18 limit 1';
+my $q = 'select * from server where type = 1 limit 1';
my $get_servers = $dbh->prepare($q);
$get_servers->execute();
my $svr = $get_servers->fetchall_arrayref( {} );
@@ -116,10 +116,10 @@ $t->post_ok(
ip6_address => '2009:334:333::2/64',
ip6_gateway => '2009:334:333::1',
interface_mtu => '9000',
- phys_location => 1,
+ phys_location => 100,
cachegroup => 1,
type => 1,
- profile => 1,
+ profile => 100,
cdn => 1,
mgmt_ip_address => '192.168.1.1',
mgmt_ip_gateway => '192.168.1.2',
@@ -161,10 +161,10 @@ sub upd_and_del() {
ip6_address => '2009:334:333::2/64',
ip6_gateway => '2009:334:333::1',
interface_mtu => '9000',
- phys_location => 1,
+ phys_location => 100,
cachegroup => 1,
type => 1,
- profile => 1,
+ profile => 100,
cdn_id => 1,
mgmt_ip_address => '192.168.3.1',
mgmt_ip_netmask => '192.168.3.2',
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/a2f026a3/traffic_ops/app/t/staticdnsentry.t
----------------------------------------------------------------------
diff --git a/traffic_ops/app/t/staticdnsentry.t b/traffic_ops/app/t/staticdnsentry.t
index 54837be..ca64d0a 100644
--- a/traffic_ops/app/t/staticdnsentry.t
+++ b/traffic_ops/app/t/staticdnsentry.t
@@ -39,7 +39,7 @@ ok $t->post_ok( '/login', => form => { u => Test::TestHelper::ADMIN_USER, p => T
####################### RW testing - careful with these! #####################################################
#these ids are created by fixtures, so we know them.
-my $dsid = 1;
+my $dsid = 100;
my $atypeid = 20;
my $locid = 1;