Remove (or rename) the original domain_name parameter in the 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/9a602f5b Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/tree/9a602f5b Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/diff/9a602f5b Branch: refs/heads/master Commit: 9a602f5b64642da30d50fdfeeea887e5ae8f6ae5 Parents: 85e5d8b Author: Jan van Doorn <jan_vando...@cable.comcast.com> Authored: Sat Dec 31 10:23:43 2016 -0700 Committer: Jan van Doorn <j...@apache.org> Committed: Fri Feb 17 17:49:10 2017 +0000 ---------------------------------------------------------------------- .../app/lib/Fixtures/Integration/Parameter.pm | 12 +-- traffic_ops/app/lib/Fixtures/Parameter.pm | 18 ++--- .../app/lib/Fixtures/ProfileParameter.pm | 84 ++++++++++---------- 3 files changed, 57 insertions(+), 57 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/9a602f5b/traffic_ops/app/lib/Fixtures/Integration/Parameter.pm ---------------------------------------------------------------------- diff --git a/traffic_ops/app/lib/Fixtures/Integration/Parameter.pm b/traffic_ops/app/lib/Fixtures/Integration/Parameter.pm index 53a0640..9633bdb 100644 --- a/traffic_ops/app/lib/Fixtures/Integration/Parameter.pm +++ b/traffic_ops/app/lib/Fixtures/Integration/Parameter.pm @@ -18,8 +18,8 @@ package Fixtures::Integration::Parameter; # under the License. -# Do not edit! Generated code. -# See https://github.com/Comcast/traffic_control/wiki/The%20Kabletown%20example +# Note - removing the NODNAME parameter wreaks all kinds of havoc because of ordering / id problems, so I renamed +# it to NODNAME - JvD use Moose; extends 'DBIx::Class::EasyFixture'; @@ -2931,7 +2931,7 @@ use namespace::autoclean; '290' => { new => 'Parameter', using => { - name => 'domain_name', + name => 'NODNAME', config_file => 'CRConfig.xml', last_updated => '2015-12-10 15:43:46', value => 'cdn1.kabletown.net', @@ -2941,7 +2941,7 @@ use namespace::autoclean; '291' => { new => 'Parameter', using => { - name => 'domain_name', + name => 'NODNAME', config_file => 'CRConfig.xml', last_updated => '2015-12-10 15:43:46', value => 'cdn2.kabletown.net', @@ -2951,7 +2951,7 @@ use namespace::autoclean; '292' => { new => 'Parameter', using => { - name => 'domain_name', + name => 'NODNAME', last_updated => '2015-12-10 15:43:47', value => 'cdn1.kabletown.net', config_file => 'CRConfig.json', @@ -2961,7 +2961,7 @@ use namespace::autoclean; '293' => { new => 'Parameter', using => { - name => 'domain_name', + name => 'NODNAME', value => 'cdn2.kabletown.net', config_file => 'CRConfig.json', last_updated => '2015-12-10 15:43:47', http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/9a602f5b/traffic_ops/app/lib/Fixtures/Parameter.pm ---------------------------------------------------------------------- diff --git a/traffic_ops/app/lib/Fixtures/Parameter.pm b/traffic_ops/app/lib/Fixtures/Parameter.pm index eb121e5..d8e4d69 100644 --- a/traffic_ops/app/lib/Fixtures/Parameter.pm +++ b/traffic_ops/app/lib/Fixtures/Parameter.pm @@ -19,15 +19,15 @@ use namespace::autoclean; use Digest::SHA1 qw(sha1_hex); my %definition_for = ( - domain_name => { - new => 'Parameter', - using => { - id => 3, - name => 'domain_name', - value => 'foo.com', - config_file => 'CRConfig.json', - }, - }, + # domain_name => { + # new => 'Parameter', + # using => { + # id => 3, + # name => 'domain_name', + # value => 'foo.com', + # config_file => 'CRConfig.json', + # }, + # }, health_threadhold_loadavg => { new => 'Parameter', using => { http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/9a602f5b/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 e2503ee..20864b2 100644 --- a/traffic_ops/app/lib/Fixtures/ProfileParameter.pm +++ b/traffic_ops/app/lib/Fixtures/ProfileParameter.pm @@ -19,48 +19,48 @@ use namespace::autoclean; use Digest::SHA1 qw(sha1_hex); my %definition_for = ( - domain_name => { - new => 'ProfileParameter', - using => { - profile => 100, - parameter => 3, - }, - }, - domain_name2 => { - new => 'ProfileParameter', - using => { - profile => 200, - parameter => 3, - }, - }, - domain_name3 => { - new => 'ProfileParameter', - using => { - profile => 300, - parameter => 3, - }, - }, - domain_name5 => { - new => 'ProfileParameter', - using => { - profile => 500, - parameter => 3, - }, - }, - domain_name6 => { - new => 'ProfileParameter', - using => { - profile => 600, - parameter => 3, - }, - }, - domain_name7 => { - new => 'ProfileParameter', - using => { - profile => 700, - parameter => 3, - }, - }, + # domain_name => { + # new => 'ProfileParameter', + # using => { + # profile => 100, + # parameter => 3, + # }, + # }, + # domain_name2 => { + # new => 'ProfileParameter', + # using => { + # profile => 200, + # parameter => 3, + # }, + # }, + # domain_name3 => { + # new => 'ProfileParameter', + # using => { + # profile => 300, + # parameter => 3, + # }, + # }, + # domain_name5 => { + # new => 'ProfileParameter', + # using => { + # profile => 500, + # parameter => 3, + # }, + # }, + # domain_name6 => { + # new => 'ProfileParameter', + # using => { + # profile => 600, + # parameter => 3, + # }, + # }, + # domain_name7 => { + # new => 'ProfileParameter', + # using => { + # profile => 700, + # parameter => 3, + # }, + # }, rascal_properties1 => { new => 'ProfileParameter', using => {
