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/03/09 19:09:23 UTC

[15/44] incubator-trafficcontrol git commit: Integration test fixtures

Integration test fixtures


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

Branch: refs/heads/master
Commit: 6832045e8e896307a186d4ffe8680810f048b716
Parents: d095923
Author: Jan van Doorn <ja...@cable.comcast.com>
Authored: Thu Dec 29 12:49:52 2016 -0700
Committer: Jan van Doorn <jv...@apache.org>
Committed: Fri Feb 17 17:49:10 2017 +0000

----------------------------------------------------------------------
 traffic_ops/app/lib/Fixtures/Cdn.pm              |  2 --
 traffic_ops/app/lib/Fixtures/Integration/Cdn.pm  | 11 +++++++----
 .../app/lib/Fixtures/Integration/Profile.pm      | 19 +++++++++++++++++++
 3 files changed, 26 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/6832045e/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 c62640a..de84382 100644
--- a/traffic_ops/app/lib/Fixtures/Cdn.pm
+++ b/traffic_ops/app/lib/Fixtures/Cdn.pm
@@ -19,7 +19,6 @@ use namespace::autoclean;
 use Digest::SHA1 qw(sha1_hex);
 
 my %definition_for = (
-	## id => 1
 	cdn1_cdn_name => {
 		new   => 'Cdn',
 		using => {
@@ -28,7 +27,6 @@ my %definition_for = (
 			domain_name => 'cdn1.kabletown.net',
 		},
 	},
-	## id => 2
 	cdn2_cdn_name => {
 		new   => 'Cdn',
 		using => {

http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/6832045e/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 d3a7eef..b62cdf0 100644
--- a/traffic_ops/app/lib/Fixtures/Integration/Cdn.pm
+++ b/traffic_ops/app/lib/Fixtures/Integration/Cdn.pm
@@ -26,21 +26,24 @@ extends 'DBIx::Class::EasyFixture';
 use namespace::autoclean;
 
 my %definition_for = (
-	## id => 1
-	'0' => {
+	'cd1' => {
 		new => 'Cdn',
+
 		using => {
+			id => 1,
 			name => 'cdn_number_1',
 			dnssec_enabled => '0',
+			domain_name => 'cdn1.kabletown.net',
 			last_updated => '2015-12-10 15:43:45',
 		},
 	},
-	## id => 2
-	'1' => {
+	'cdn2' => {
 		new => 'Cdn',
 		using => {
+			id => 2,
 			name => 'cdn_number_2',
 			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/6832045e/traffic_ops/app/lib/Fixtures/Integration/Profile.pm
----------------------------------------------------------------------
diff --git a/traffic_ops/app/lib/Fixtures/Integration/Profile.pm b/traffic_ops/app/lib/Fixtures/Integration/Profile.pm
index 784f885..eea64cf 100644
--- a/traffic_ops/app/lib/Fixtures/Integration/Profile.pm
+++ b/traffic_ops/app/lib/Fixtures/Integration/Profile.pm
@@ -32,6 +32,7 @@ use namespace::autoclean;
 		using => {
 			name => 'CCR_CDN1',
 			description => 'Comcast Content Router for cdn1.cdn.net',
+			cdn => 1,
 			last_updated => '2015-12-10 15:43:48',
 		},
 	},
@@ -41,6 +42,7 @@ use namespace::autoclean;
 		using => {
 			name => 'CCR_CDN2',
 			description => 'Comcast Content Router for cdn2.comcast.net',
+			cdn => 2,
 			last_updated => '2015-12-10 15:43:48',
 		},
 	},
@@ -50,6 +52,7 @@ use namespace::autoclean;
 		using => {
 			name => 'EDGE1_CDN1_402',
 			description => 'Dell R720xd, Edge, CDN1 CDN, ATS v4.0.2',
+			cdn => 1,
 			last_updated => '2015-12-10 15:43:48',
 		},
 	},
@@ -59,6 +62,7 @@ use namespace::autoclean;
 		using => {
 			name => 'EDGE1_CDN1_421',
 			description => 'Dell R720xd, Edge, CDN1 CDN, ATS v4.2.1, Consistent Parent',
+			cdn => 1,
 			last_updated => '2015-12-10 15:43:48',
 		},
 	},
@@ -68,6 +72,7 @@ use namespace::autoclean;
 		using => {
 			name => 'EDGE1_CDN1_421_SSL',
 			description => 'Dell r720xd, Edge, CDN1 CDN, ATS v4.2.1, SSL enabled',
+			cdn => 1,
 			last_updated => '2015-12-10 15:43:48',
 		},
 	},
@@ -77,6 +82,7 @@ use namespace::autoclean;
 		using => {
 			name => 'EDGE1_CDN2_402',
 			last_updated => '2015-12-10 15:43:48',
+			cdn => 2,
 			description => 'Dell R720xd, Edge, CDN2 CDN, ATS v4.0.2',
 		},
 	},
@@ -86,6 +92,7 @@ use namespace::autoclean;
 		using => {
 			name => 'EDGE1_CDN2_421',
 			description => 'Dell R720xd, Edge, CDN2 CDN, ATS v4.2.1, Consistent Parent',
+			cdn => 2,
 			last_updated => '2015-12-10 15:43:48',
 		},
 	},
@@ -95,6 +102,7 @@ use namespace::autoclean;
 		using => {
 			name => 'EDGE2_CDN1',
 			description => 'HP DL380 Edge',
+			cdn => 1,
 			last_updated => '2015-12-10 15:43:48',
 		},
 	},
@@ -104,6 +112,7 @@ use namespace::autoclean;
 		using => {
 			name => 'EDGE2_CDN1_402',
 			description => 'HP DL380, Edge, CDN1 CDN, ATS v4.0.x',
+			cdn => 1,
 			last_updated => '2015-12-10 15:43:48',
 		},
 	},
@@ -113,6 +122,7 @@ use namespace::autoclean;
 		using => {
 			name => 'EDGE2_CDN2_402',
 			description => 'HP DL380, Edge, CDN2 CDN, ATS v4.0.x',
+			cdn => 2,
 			last_updated => '2015-12-10 15:43:48',
 		},
 	},
@@ -122,6 +132,7 @@ use namespace::autoclean;
 		using => {
 			name => 'EDGE2_CDN2_421',
 			description => 'HP DL380, Edge, CDN2 CDN, ATS v4.2.1, Consistent Parent',
+			cdn => 2,
 			last_updated => '2015-12-10 15:43:48',
 		},
 	},
@@ -140,6 +151,7 @@ use namespace::autoclean;
 		using => {
 			name => 'MID1_CDN1_421',
 			description => 'Dell R720xd, Mid, CDN1 CDN, ATS v4.2.1',
+			cdn => 1,
 			last_updated => '2015-12-10 15:43:48',
 		},
 	},
@@ -149,6 +161,7 @@ use namespace::autoclean;
 		using => {
 			name => 'MID1_CDN2_402',
 			description => 'Dell R720xd, Mid, CDN2 CDN, new vol config, ATS v4.0.x',
+			cdn => 2,
 			last_updated => '2015-12-10 15:43:48',
 		},
 	},
@@ -158,6 +171,7 @@ use namespace::autoclean;
 		using => {
 			name => 'MID1_CDN2_421',
 			description => 'Dell R720xd, Mid, CDN2 CDN, ATS v4.2.1',
+			cdn => 2,
 			last_updated => '2015-12-10 15:43:48',
 		},
 	},
@@ -167,6 +181,7 @@ use namespace::autoclean;
 		using => {
 			name => 'MID2_CDN1',
 			description => 'HP DL380 Mid',
+			cdn => 1,
 			last_updated => '2015-12-10 15:43:48',
 		},
 	},
@@ -176,6 +191,7 @@ use namespace::autoclean;
 		using => {
 			name => 'ORG1_CDN1',
 			last_updated => '2015-12-10 15:43:48',
+			cdn => 1,
 			description => 'Multi site origin profile 1',
 		},
 	},
@@ -185,6 +201,7 @@ use namespace::autoclean;
 		using => {
 			name => 'ORG2_CDN1',
 			description => 'Multi site origin profile 2',
+			cdn => 1,
 			last_updated => '2015-12-10 15:43:48',
 		},
 	},
@@ -194,6 +211,7 @@ use namespace::autoclean;
 		using => {
 			name => 'RASCAL_CDN1',
 			description => 'TrafficMonitor for CDN1',
+			cdn => 1,
 			last_updated => '2015-12-10 15:43:48',
 		},
 	},
@@ -202,6 +220,7 @@ use namespace::autoclean;
 		new => 'Profile',
 		using => {
 			name => 'RASCAL_CDN2',
+			cdn => 2,
 			last_updated => '2015-12-10 15:43:48',
 			description => 'TrafficMonitor for CDN2 ',
 		},