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 2017/06/19 18:54:06 UTC
[1/3] incubator-trafficcontrol git commit: fixed the CDN names to
match the profiles
Repository: incubator-trafficcontrol
Updated Branches:
refs/heads/master 7e94247f1 -> d7cfb2e12
fixed the CDN names to match the profiles
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/commit/dfffa30b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/tree/dfffa30b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/diff/dfffa30b
Branch: refs/heads/master
Commit: dfffa30b7b5cae54d97305bad7ae553742c39ef7
Parents: a2e006e
Author: Dewayne Richardson <de...@apache.org>
Authored: Mon Jun 12 09:12:26 2017 -0600
Committer: Dan Kirkwood <da...@gmail.com>
Committed: Mon Jun 19 12:53:25 2017 -0600
----------------------------------------------------------------------
traffic_ops/app/lib/Fixtures/Integration/Cdn.pm | 4 ++--
traffic_ops/app/t_integration/server.t | 10 +++++-----
2 files changed, 7 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/dfffa30b/traffic_ops/app/lib/Fixtures/Integration/Cdn.pm
----------------------------------------------------------------------
diff --git a/traffic_ops/app/lib/Fixtures/Integration/Cdn.pm b/traffic_ops/app/lib/Fixtures/Integration/Cdn.pm
index b62cdf0..6ec3462 100644
--- a/traffic_ops/app/lib/Fixtures/Integration/Cdn.pm
+++ b/traffic_ops/app/lib/Fixtures/Integration/Cdn.pm
@@ -31,7 +31,7 @@ my %definition_for = (
using => {
id => 1,
- name => 'cdn_number_1',
+ name => 'CDN1',
dnssec_enabled => '0',
domain_name => 'cdn1.kabletown.net',
last_updated => '2015-12-10 15:43:45',
@@ -41,7 +41,7 @@ my %definition_for = (
new => 'Cdn',
using => {
id => 2,
- name => 'cdn_number_2',
+ name => 'CDN2',
dnssec_enabled => '0',
domain_name => 'cdn2.kabletown.net',
last_updated => '2015-12-10 15:43:45',
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/dfffa30b/traffic_ops/app/t_integration/server.t
----------------------------------------------------------------------
diff --git a/traffic_ops/app/t_integration/server.t b/traffic_ops/app/t_integration/server.t
index ab2dfc2..c549694 100644
--- a/traffic_ops/app/t_integration/server.t
+++ b/traffic_ops/app/t_integration/server.t
@@ -180,7 +180,7 @@ my $header =
# Good Test
my $content = join( "\n",
$header,
- "good-host,chi.kabletown.net,bond0,10.10.2.200,255.255.255.0,10.10.2.254,2033:D0D0:3300::2:1A/64,2033:D0D0:3300::2:1,9000,cdn_number_1,us-il-chicago,plocation-chi-1,rack33,EDGE,1,80,10.10.33.1,255.255.255.0,10.10.33.44,10.254.254.12,255.255.255.0,10.254.254.1,user,passwd,router_33,port_66,443,N/A\n"
+ "good-host,chi.kabletown.net,bond0,10.10.2.200,255.255.255.0,10.10.2.254,2033:D0D0:3300::2:1A/64,2033:D0D0:3300::2:1,9000,CDN1,us-il-chicago,plocation-chi-1,rack33,EDGE,1,80,10.10.33.1,255.255.255.0,10.10.33.44,10.254.254.12,255.255.255.0,10.254.254.1,user,passwd,router_33,port_66,443,N/A\n"
);
&build_tmpfile($content);
@@ -194,7 +194,7 @@ $t->post_ok(
# Bad 'Type' look for -BAD
$content = join( "\n",
$header,
- "atsec-chi-09,chi.kabletown.net,bond0,10.10.2.200,255.255.255.0,10.10.2.254,2033:D0D0:3300::2:1A/64,2033:D0D0:3300::2:1,9000,cdn_number_1,us-il-chicago,plocation-chi-1,rack33,EDGE-BAD,1,80,10.10.33.1,255.255.255.0,10.10.33.44,10.254.254.12,255.255.255.0,10.254.254.1,user,passwd,router_33,port_66,443,N/A\n"
+ "atsec-chi-09,chi.kabletown.net,bond0,10.10.2.200,255.255.255.0,10.10.2.254,2033:D0D0:3300::2:1A/64,2033:D0D0:3300::2:1,9000,CDN1,us-il-chicago,plocation-chi-1,rack33,EDGE-BAD,1,80,10.10.33.1,255.255.255.0,10.10.33.44,10.254.254.12,255.255.255.0,10.254.254.1,user,passwd,router_33,port_66,443,N/A\n"
);
&build_tmpfile($content);
@@ -206,7 +206,7 @@ $t->post_ok(
# Bad 'Profile' look for -BAD
$content = join( "\n",
$header,
- "atsec-chi-09,chi.kabletown.net,bond0,10.10.2.200,255.255.255.0,10.10.2.254,2033:D0D0:3300::2:1A/64,2033:D0D0:3300::2:1,9000,cdn_number_2,us-il-chicago,plocation-chi-1,rack33,EDGE,1-BAD,80,10.10.33.1,255.255.255.0,10.10.33.44,10.254.254.12,255.255.255.0,10.254.254.1,user,passwd,router_33,port_66,443,N/A\n"
+ "atsec-chi-09,chi.kabletown.net,bond0,10.10.2.200,255.255.255.0,10.10.2.254,2033:D0D0:3300::2:1A/64,2033:D0D0:3300::2:1,9000,CDN2,us-il-chicago,plocation-chi-1,rack33,EDGE,1-BAD,80,10.10.33.1,255.255.255.0,10.10.33.44,10.254.254.12,255.255.255.0,10.254.254.1,user,passwd,router_33,port_66,443,N/A\n"
);
&build_tmpfile($content);
@@ -218,14 +218,14 @@ $t->post_ok(
# Bad 'Cache Group' look for -BAD
$content = join( "\n",
$header,
- "atsec-chi-09,chi.kabletown.net,bond0,10.10.2.200,255.255.255.0,10.10.2.254,2033:D0D0:3300::2:1A/64,2033:D0D0:3300::2:1,9000,cdn_number_2,us-il-chicago-BAD,plocation-chi-1,rack33,EDGE,1,80,10.10.33.1,255.255.255.0,10.10.33.44,10.254.254.12,255.255.255.0,10.254.254.1,user,passwd,router_33,port_66,443,N/A\n"
+ "atsec-chi-09,chi.kabletown.net,bond0,10.10.2.200,255.255.255.0,10.10.2.254,2033:D0D0:3300::2:1A/64,2033:D0D0:3300::2:1,9000,CDN2,us-il-chicago-BAD,plocation-chi-1,rack33,EDGE,1,80,10.10.33.1,255.255.255.0,10.10.33.44,10.254.254.12,255.255.255.0,10.254.254.1,user,passwd,router_33,port_66,443,N/A\n"
);
#----------------------------
# Bad 'Physical Location' look for -BAD
$content = join( "\n",
$header,
- "atsec-chi-09,chi.kabletown.net,bond0,10.10.2.200,255.255.255.0,10.10.2.254,2033:D0D0:3300::2:1A/64,2033:D0D0:3300::2:1,9000,cdn_number_1,us-il-chicago,plocation-chi-1-BAD,rack33,EDGE,1,80,10.10.33.1,255.255.255.0,10.10.33.44,10.254.254.12,255.255.255.0,10.254.254.1,user,passwd,router_33,port_66,443,N/A\n"
+ "atsec-chi-09,chi.kabletown.net,bond0,10.10.2.200,255.255.255.0,10.10.2.254,2033:D0D0:3300::2:1A/64,2033:D0D0:3300::2:1,9000,CDN1,us-il-chicago,plocation-chi-1-BAD,rack33,EDGE,1,80,10.10.33.1,255.255.255.0,10.10.33.44,10.254.254.12,255.255.255.0,10.254.254.1,user,passwd,router_33,port_66,443,N/A\n"
);
&build_tmpfile($content);
[3/3] incubator-trafficcontrol git commit: This closes #668.
Posted by da...@apache.org.
This closes #668.
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/commit/d7cfb2e1
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/tree/d7cfb2e1
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/diff/d7cfb2e1
Branch: refs/heads/master
Commit: d7cfb2e12452814b7050f730f4bc9fdcd74eedcb
Parents: dfffa30
Author: Dan Kirkwood <da...@gmail.com>
Authored: Mon Jun 19 12:53:56 2017 -0600
Committer: Dan Kirkwood <da...@gmail.com>
Committed: Mon Jun 19 12:53:56 2017 -0600
----------------------------------------------------------------------
----------------------------------------------------------------------
[2/3] incubator-trafficcontrol git commit: realigned the regex type
to point to regex types
Posted by da...@apache.org.
realigned the regex type to point to regex types
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/commit/a2e006e1
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/tree/a2e006e1
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/diff/a2e006e1
Branch: refs/heads/master
Commit: a2e006e177203afadaddabab9f986119fd549865
Parents: 7e94247
Author: Dewayne Richardson <de...@apache.org>
Authored: Mon Jun 12 09:11:06 2017 -0600
Committer: Dan Kirkwood <da...@gmail.com>
Committed: Mon Jun 19 12:53:25 2017 -0600
----------------------------------------------------------------------
traffic_ops/app/lib/Fixtures/Integration/Regex.pm | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/a2e006e1/traffic_ops/app/lib/Fixtures/Integration/Regex.pm
----------------------------------------------------------------------
diff --git a/traffic_ops/app/lib/Fixtures/Integration/Regex.pm b/traffic_ops/app/lib/Fixtures/Integration/Regex.pm
index 1eac8b7..3897c83 100644
--- a/traffic_ops/app/lib/Fixtures/Integration/Regex.pm
+++ b/traffic_ops/app/lib/Fixtures/Integration/Regex.pm
@@ -32,7 +32,7 @@ my %definition_for = (
using => {
pattern => '.*\.games\..*',
last_updated => '2015-12-10 15:43:45',
- type => '20',
+ type => '16',
},
},
## id => 2
@@ -41,7 +41,7 @@ my %definition_for = (
using => {
pattern => '.*\.games\..*',
last_updated => '2015-12-10 15:43:45',
- type => '20',
+ type => '16',
},
},
## id => 3
@@ -50,7 +50,7 @@ my %definition_for = (
using => {
pattern => '.*\.images\..*',
last_updated => '2015-12-10 15:43:45',
- type => '20',
+ type => '16',
},
},
## id => 4
@@ -59,7 +59,7 @@ my %definition_for = (
using => {
pattern => '.*\.images\..*',
last_updated => '2015-12-10 15:43:45',
- type => '20',
+ type => '16',
},
},
## id => 5
@@ -67,7 +67,7 @@ my %definition_for = (
new => 'Regex',
using => {
pattern => '.*\.movies\..*',
- type => '20',
+ type => '16',
last_updated => '2015-12-10 15:43:45',
},
},
@@ -77,7 +77,7 @@ my %definition_for = (
using => {
pattern => '.*\.movies\..*',
last_updated => '2015-12-10 15:43:45',
- type => '20',
+ type => '16',
},
},
## id => 7
@@ -86,7 +86,7 @@ my %definition_for = (
using => {
pattern => '.*\.tv\..*',
last_updated => '2015-12-10 15:43:45',
- type => '20',
+ type => '16',
},
},
## id => 8
@@ -95,7 +95,7 @@ my %definition_for = (
using => {
pattern => '.*\.tv\..*',
last_updated => '2015-12-10 15:43:45',
- type => '20',
+ type => '16',
},
},
);