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/14 17:07:16 UTC
[13/53] [abbrv] incubator-trafficcontrol git commit: fixing
integration tests.
fixing integration tests.
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/commit/969a182e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/tree/969a182e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/diff/969a182e
Branch: refs/heads/psql-rebase
Commit: 969a182e3efe4741d447c52b3deba5bf6b5deb25
Parents: af0c115
Author: Jackie Heitzer <ja...@cable.comcast.com>
Authored: Tue Aug 2 14:50:22 2016 -0600
Committer: Dan Kirkwood <da...@gmail.com>
Committed: Fri Nov 11 13:26:33 2016 -0700
----------------------------------------------------------------------
traffic_ops/app/db/create_tables.sql | 4 +-
traffic_ops/app/lib/API/ServerCheck.pm | 2 +-
traffic_ops/app/lib/API/ToExtension.pm | 4 +-
.../app/lib/Fixtures/Integration/Server.pm | 166 +++++++++----------
.../app/lib/Test/IntegrationTestHelper.pm | 1 +
traffic_ops/app/lib/UI/ConfigFiles.pm | 4 +-
traffic_ops/app/t_integration/extensions.t | 2 -
7 files changed, 91 insertions(+), 92 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/969a182e/traffic_ops/app/db/create_tables.sql
----------------------------------------------------------------------
diff --git a/traffic_ops/app/db/create_tables.sql b/traffic_ops/app/db/create_tables.sql
index 4c53da6..fa520cf 100644
--- a/traffic_ops/app/db/create_tables.sql
+++ b/traffic_ops/app/db/create_tables.sql
@@ -1019,7 +1019,6 @@ CREATE TABLE servercheck (
ap bigint,
aq bigint,
ar bigint,
- "as" bigint,
at bigint,
au bigint,
av bigint,
@@ -1032,6 +1031,7 @@ CREATE TABLE servercheck (
bc bigint,
bd bigint,
be bigint,
+ bf bigint,
last_updated timestamp with time zone DEFAULT now()
);
@@ -1896,7 +1896,7 @@ SELECT pg_catalog.setval('server_id_seq', 1, true);
-- Data for Name: servercheck; Type: TABLE DATA; Schema: public; Owner: to_user
--
-COPY servercheck (id, server, aa, ab, ac, ad, ae, af, ag, ah, ai, aj, ak, al, am, an, ao, ap, aq, ar, "as", at, au, av, aw, ax, ay, az, ba, bb, bc, bd, be, last_updated) FROM stdin;
+COPY servercheck (id, server, aa, ab, ac, ad, ae, af, ag, ah, ai, aj, ak, al, am, an, ao, ap, aq, ar, at, au, av, aw, ax, ay, az, ba, bb, bc, bd, be, bf last_updated) FROM stdin;
\.
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/969a182e/traffic_ops/app/lib/API/ServerCheck.pm
----------------------------------------------------------------------
diff --git a/traffic_ops/app/lib/API/ServerCheck.pm b/traffic_ops/app/lib/API/ServerCheck.pm
index 8081986..34dd6a7 100644
--- a/traffic_ops/app/lib/API/ServerCheck.pm
+++ b/traffic_ops/app/lib/API/ServerCheck.pm
@@ -38,7 +38,7 @@ sub aadata {
my $rs_type = $self->db->resultset('Type')->search( \%condition );
my $rs =
$self->db->resultset('Server')
- ->search( { type => { -in => $rs_type->get_column('id')->as_query } }, { prefetch => [ 'servercheck', 'status', 'profile' ] } );
+ ->search( { type => { -in => $rs_type->get_column('id')->as_query } }, { prefetch => [ 'servercheck', 'status', 'profile' ]} );
while ( my $server = $rs->next ) {
if ( !defined $server || !defined $server->servercheck ) {
next;
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/969a182e/traffic_ops/app/lib/API/ToExtension.pm
----------------------------------------------------------------------
diff --git a/traffic_ops/app/lib/API/ToExtension.pm b/traffic_ops/app/lib/API/ToExtension.pm
index 7acfe55..ee7494f 100644
--- a/traffic_ops/app/lib/API/ToExtension.pm
+++ b/traffic_ops/app/lib/API/ToExtension.pm
@@ -142,7 +142,7 @@ sub update {
# check extensions go in an open slot in the extensions table, first check if there's an open slot.
my $open_type = &type_id( $self, 'CHECK_EXTENSION_OPEN_SLOT' );
- my $slot = $self->db->resultset('ToExtension')->search( { type => $open_type }, { rows => 1 } )->single();
+ my $slot = $self->db->resultset('ToExtension')->search( { type => $open_type }, { rows => 1, order_by => ["servercheck_column_name"] } )->single();
if ( !defined($slot) ) {
return $self->alert( { error => "No open slots left for checks, delete one first." } );
}
@@ -162,7 +162,7 @@ sub update {
# set all values in servercheck to 0
my $clear = $self->db->resultset('Servercheck')->search( {} ); # all
- $clear->update( { '`' . $slot->servercheck_column_name . '`' => 0 } ); #
+ $clear->update( { $slot->servercheck_column_name => 0 } ); #
return $self->success_message( "Check Extension Loaded.", { id => $slot->id } );
}
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/969a182e/traffic_ops/app/lib/Fixtures/Integration/Server.pm
----------------------------------------------------------------------
diff --git a/traffic_ops/app/lib/Fixtures/Integration/Server.pm b/traffic_ops/app/lib/Fixtures/Integration/Server.pm
index 20f0588..8e38ff9 100644
--- a/traffic_ops/app/lib/Fixtures/Integration/Server.pm
+++ b/traffic_ops/app/lib/Fixtures/Integration/Server.pm
@@ -47,7 +47,7 @@ my %definition_for = (
ip_netmask => '255.255.255.0',
mgmt_ip_address => '',
mgmt_ip_netmask => '',
- status => '1',
+ status => '6',
upd_pending => '0',
ilo_password => '',
ilo_username => '',
@@ -80,7 +80,7 @@ my %definition_for = (
ip_netmask => '255.255.255.0',
rack => 'RR 119.02',
router_port_name => '2',
- status => '1',
+ status => '6',
cachegroup => '9',
cdn_id => '1',
ilo_ip_address => '172.16.2.7',
@@ -120,7 +120,7 @@ my %definition_for = (
router_port_name => '2',
interface_name => 'bond0',
profile => '5',
- status => '1',
+ status => '6',
tcp_port => '80',
xmpp_id => 'atsec-chi-02-dummyxmpp',
domain_name => 'chi.kabletown.net',
@@ -170,7 +170,7 @@ my %definition_for = (
upd_pending => '0',
xmpp_id => 'atsec-chi-03-dummyxmpp',
last_updated => '2015-12-10 15:44:37',
- status => '1',
+ status => '6',
xmpp_passwd => 'X',
},
},
@@ -207,7 +207,7 @@ my %definition_for = (
cdn_id => '2',
ilo_ip_address => '172.16.2.10',
ip6_gateway => '2033:D0D0:3300::2:1',
- status => '1',
+ status => '6',
xmpp_passwd => 'X',
},
},
@@ -222,7 +222,7 @@ my %definition_for = (
domain_name => 'chi.kabletown.net',
ip_netmask => '255.255.255.0',
mgmt_ip_address => '',
- status => '1',
+ status => '6',
cachegroup => '9',
ilo_username => '',
xmpp_id => 'atsec-chi-05-dummyxmpp',
@@ -276,7 +276,7 @@ my %definition_for = (
cdn_id => '2',
profile => '7',
router_host_name => 'rtr-chi.kabletown.net',
- status => '1',
+ status => '6',
ip6_address => '2033:D0D0:3300::2:8/64',
last_updated => '2015-12-10 15:44:37',
upd_pending => '0',
@@ -313,7 +313,7 @@ my %definition_for = (
router_port_name => '2',
ilo_ip_address => '172.16.2.13',
rack => 'RR 119.02',
- status => '1',
+ status => '6',
domain_name => 'chi.kabletown.net',
ilo_ip_netmask => '255.255.255.0',
ip_gateway => '10.10.2.1',
@@ -338,7 +338,7 @@ my %definition_for = (
ilo_username => '',
last_updated => '2015-12-10 15:44:37',
phys_location => '4',
- status => '1',
+ status => '6',
ip_address => '10.10.2.10',
upd_pending => '0',
rack => 'RR 119.02',
@@ -392,7 +392,7 @@ my %definition_for = (
ip_netmask => '255.255.255.0',
router_host_name => 'rtr-den.kabletown.net',
router_port_name => '5',
- status => '1',
+ status => '6',
upd_pending => '0',
},
},
@@ -423,7 +423,7 @@ my %definition_for = (
ip_address => '10.10.5.3',
profile => '5',
router_host_name => 'rtr-den.kabletown.net',
- status => '1',
+ status => '6',
ilo_ip_address => '172.16.5.7',
interface_name => 'bond0',
ip_netmask => '255.255.255.0',
@@ -450,7 +450,7 @@ my %definition_for = (
ip_gateway => '10.10.5.1',
tcp_port => '80',
upd_pending => '0',
- status => '1',
+ status => '6',
domain_name => 'den.kabletown.net',
phys_location => '5',
profile => '5',
@@ -476,7 +476,7 @@ my %definition_for = (
using => {
host_name => 'atsec-den-03',
mgmt_ip_netmask => '',
- status => '1',
+ status => '6',
cdn_id => '1',
domain_name => 'den.kabletown.net',
ilo_ip_address => '172.16.5.9',
@@ -532,7 +532,7 @@ my %definition_for = (
ip_gateway => '10.10.5.1',
last_updated => '2015-12-10 15:44:37',
rack => 'RR 119.02',
- status => '1',
+ status => '6',
ip_address => '10.10.5.6',
interface_mtu => '9000',
mgmt_ip_gateway => '',
@@ -561,7 +561,7 @@ my %definition_for = (
ilo_ip_gateway => '172.16.5.1',
ilo_password => '',
last_updated => '2015-12-10 15:44:37',
- status => '1',
+ status => '6',
upd_pending => '0',
xmpp_passwd => 'X',
interface_mtu => '9000',
@@ -598,7 +598,7 @@ my %definition_for = (
mgmt_ip_address => '',
mgmt_ip_gateway => '',
phys_location => '6',
- status => '1',
+ status => '6',
upd_pending => '0',
xmpp_id => 'atsec-den-06-dummyxmpp',
cachegroup => '8',
@@ -634,7 +634,7 @@ my %definition_for = (
ip6_gateway => '2033:D0D0:3300::5:1',
ip_netmask => '255.255.255.0',
mgmt_ip_gateway => '',
- status => '1',
+ status => '6',
cachegroup => '8',
ip_address => '10.10.5.9',
type => '13',
@@ -673,7 +673,7 @@ my %definition_for = (
ilo_password => '',
interface_name => 'bond0',
router_host_name => 'rtr-den.kabletown.net',
- status => '1',
+ status => '6',
cachegroup => '8',
ilo_ip_netmask => '255.255.255.0',
mgmt_ip_gateway => '',
@@ -705,7 +705,7 @@ my %definition_for = (
interface_name => 'bond0',
type => '13',
router_host_name => 'rtr-hou.kabletown.net',
- status => '1',
+ status => '6',
upd_pending => '0',
cachegroup => '12',
ilo_ip_address => '172.16.3.6',
@@ -758,7 +758,7 @@ my %definition_for = (
ip_netmask => '255.255.255.0',
mgmt_ip_gateway => '',
router_port_name => '3',
- status => '1',
+ status => '6',
type => '13',
xmpp_id => 'atsec-hou-01-dummyxmpp',
ip6_address => '2033:D0D0:3300::3:3/64',
@@ -786,7 +786,7 @@ my %definition_for = (
ilo_ip_gateway => '172.16.3.1',
interface_name => 'bond0',
profile => '5',
- status => '1',
+ status => '6',
xmpp_id => 'atsec-hou-02-dummyxmpp',
domain_name => 'hou.kabletown.net',
mgmt_ip_netmask => '',
@@ -816,7 +816,7 @@ my %definition_for = (
ilo_ip_gateway => '172.16.3.1',
ilo_ip_netmask => '255.255.255.0',
interface_mtu => '9000',
- status => '1',
+ status => '6',
xmpp_passwd => 'X',
cachegroup => '12',
mgmt_ip_netmask => '',
@@ -855,7 +855,7 @@ my %definition_for = (
ilo_password => '',
ip6_gateway => '2033:D0D0:3300::3:1',
mgmt_ip_netmask => '',
- status => '1',
+ status => '6',
xmpp_passwd => 'X',
cdn_id => '2',
type => '13',
@@ -893,7 +893,7 @@ my %definition_for = (
mgmt_ip_gateway => '',
last_updated => '2015-12-10 15:44:37',
router_host_name => 'rtr-hou.kabletown.net',
- status => '1',
+ status => '6',
xmpp_passwd => 'X',
ilo_ip_netmask => '255.255.255.0',
type => '13',
@@ -927,7 +927,7 @@ my %definition_for = (
ilo_ip_gateway => '172.16.3.1',
mgmt_ip_netmask => '',
phys_location => '8',
- status => '1',
+ status => '6',
tcp_port => '80',
cdn_id => '2',
interface_mtu => '9000',
@@ -971,7 +971,7 @@ my %definition_for = (
ilo_ip_address => '172.16.3.13',
interface_name => 'bond0',
router_host_name => 'rtr-hou.kabletown.net',
- status => '1',
+ status => '6',
type => '13',
profile => '7',
router_port_name => '3',
@@ -1009,7 +1009,7 @@ my %definition_for = (
ip6_address => '2033:D0D0:3300::3:10/64',
ip_netmask => '255.255.255.0',
mgmt_ip_netmask => '',
- status => '1',
+ status => '6',
tcp_port => '80',
xmpp_passwd => 'X',
interface_name => 'bond0',
@@ -1030,7 +1030,7 @@ my %definition_for = (
new => 'Server',
using => {
host_name => 'atsec-lax-00',
- status => '1',
+ status => '6',
ilo_ip_netmask => '255.255.255.0',
mgmt_ip_address => '',
phys_location => '9',
@@ -1068,7 +1068,7 @@ my %definition_for = (
using => {
host_name => 'atsec-lax-01',
mgmt_ip_address => '',
- status => '1',
+ status => '6',
upd_pending => '0',
ilo_ip_netmask => '255.255.255.0',
interface_name => 'bond0',
@@ -1133,7 +1133,7 @@ my %definition_for = (
ilo_ip_address => '172.16.1.8',
ip_gateway => '10.10.1.1',
phys_location => '9',
- status => '1',
+ status => '6',
},
},
## id => 31
@@ -1152,7 +1152,7 @@ my %definition_for = (
interface_mtu => '9000',
ip_gateway => '10.10.1.1',
router_host_name => 'rtr-lax.kabletown.net',
- status => '1',
+ status => '6',
cachegroup => '7',
ilo_ip_address => '172.16.1.9',
last_updated => '2015-12-10 15:44:37',
@@ -1201,7 +1201,7 @@ my %definition_for = (
cachegroup => '7',
ip6_address => '2033:D0D0:3300::1:6/64',
last_updated => '2015-12-10 15:44:37',
- status => '1',
+ status => '6',
interface_mtu => '9000',
interface_name => 'bond0',
ilo_ip_gateway => '172.16.1.1',
@@ -1233,7 +1233,7 @@ my %definition_for = (
interface_mtu => '9000',
last_updated => '2015-12-10 15:44:36',
phys_location => '10',
- status => '1',
+ status => '6',
xmpp_passwd => 'X',
cachegroup => '7',
ilo_ip_address => '172.16.1.11',
@@ -1255,7 +1255,7 @@ my %definition_for = (
ilo_ip_netmask => '255.255.255.0',
ip6_gateway => '2033:D0D0:3300::1:1',
rack => 'RR 119.02',
- status => '1',
+ status => '6',
type => '13',
cachegroup => '7',
ip_address => '10.10.1.8',
@@ -1302,7 +1302,7 @@ my %definition_for = (
cdn_id => '2',
rack => 'RR 119.02',
mgmt_ip_address => '',
- status => '1',
+ status => '6',
xmpp_id => 'atsec-lax-07-dummyxmpp',
ilo_ip_gateway => '172.16.1.1',
ilo_ip_netmask => '255.255.255.0',
@@ -1345,7 +1345,7 @@ my %definition_for = (
upd_pending => '0',
ilo_ip_netmask => '255.255.255.0',
ip_address => '10.10.1.10',
- status => '1',
+ status => '6',
type => '13',
mgmt_ip_netmask => '',
rack => 'RR 119.02',
@@ -1368,7 +1368,7 @@ my %definition_for = (
interface_name => 'bond0',
xmpp_id => 'atsec-nyc-00-dummyxmpp',
router_host_name => 'rtr-nyc.kabletown.net',
- status => '1',
+ status => '6',
cdn_id => '1',
ilo_password => '',
phys_location => '11',
@@ -1421,7 +1421,7 @@ my %definition_for = (
rack => 'RR 119.02',
last_updated => '2015-12-10 15:44:37',
mgmt_ip_netmask => '',
- status => '1',
+ status => '6',
ip_gateway => '10.10.0.1',
mgmt_ip_gateway => '',
ip6_address => '2033:D0D0:3300::0:3/64',
@@ -1445,7 +1445,7 @@ my %definition_for = (
last_updated => '2015-12-10 15:44:37',
cdn_id => '1',
interface_mtu => '9000',
- status => '1',
+ status => '6',
ip_gateway => '10.10.0.1',
router_port_name => '0',
phys_location => '11',
@@ -1476,7 +1476,7 @@ my %definition_for = (
host_name => 'atsec-nyc-03',
phys_location => '11',
router_host_name => 'rtr-nyc.kabletown.net',
- status => '1',
+ status => '6',
mgmt_ip_address => '',
mgmt_ip_gateway => '',
profile => '5',
@@ -1512,7 +1512,7 @@ my %definition_for = (
using => {
host_name => 'atsec-nyc-04',
ip_address => '10.10.0.6',
- status => '1',
+ status => '6',
ilo_ip_netmask => '255.255.255.0',
interface_mtu => '9000',
router_host_name => 'rtr-nyc.kabletown.net',
@@ -1557,7 +1557,7 @@ my %definition_for = (
router_port_name => '0',
xmpp_passwd => 'X',
last_updated => '2015-12-10 15:44:37',
- status => '1',
+ status => '6',
interface_name => 'bond0',
ip6_gateway => '2033:D0D0:3300::0:1',
phys_location => '12',
@@ -1596,7 +1596,7 @@ my %definition_for = (
ip_address => '10.10.0.8',
xmpp_id => 'atsec-nyc-06-dummyxmpp',
ilo_password => '',
- status => '1',
+ status => '6',
rack => 'RR 119.02',
last_updated => '2015-12-10 15:44:36',
mgmt_ip_address => '',
@@ -1645,7 +1645,7 @@ my %definition_for = (
ip6_address => '2033:D0D0:3300::0:9/64',
ip_netmask => '255.255.255.0',
rack => 'RR 119.02',
- status => '1',
+ status => '6',
cdn_id => '2',
ilo_ip_netmask => '255.255.255.0',
cachegroup => '10',
@@ -1659,7 +1659,7 @@ my %definition_for = (
new => 'Server',
using => {
host_name => 'atsec-nyc-08',
- status => '1',
+ status => '6',
tcp_port => '80',
ilo_ip_address => '172.16.0.14',
ip_netmask => '255.255.255.0',
@@ -1721,7 +1721,7 @@ my %definition_for = (
ilo_ip_netmask => '255.255.255.0',
ip_netmask => '255.255.255.0',
profile => '5',
- status => '1',
+ status => '6',
last_updated => '2015-12-10 15:44:36',
mgmt_ip_gateway => '',
phys_location => '13',
@@ -1749,7 +1749,7 @@ my %definition_for = (
interface_name => 'bond0',
ip6_gateway => '2033:D0D0:3300::4:1',
mgmt_ip_address => '',
- status => '1',
+ status => '6',
last_updated => '2015-12-10 15:44:36',
cdn_id => '1',
ilo_ip_address => '172.16.4.7',
@@ -1787,7 +1787,7 @@ my %definition_for = (
interface_mtu => '9000',
ip6_gateway => '2033:D0D0:3300::4:1',
ip_netmask => '255.255.255.0',
- status => '1',
+ status => '6',
ilo_password => '',
last_updated => '2015-12-10 15:44:37',
phys_location => '13',
@@ -1808,7 +1808,7 @@ my %definition_for = (
using => {
host_name => 'atsec-phl-03',
phys_location => '13',
- status => '1',
+ status => '6',
upd_pending => '0',
ilo_ip_netmask => '255.255.255.0',
ilo_username => '',
@@ -1864,7 +1864,7 @@ my %definition_for = (
ip_gateway => '10.10.4.1',
mgmt_ip_gateway => '',
rack => 'RR 119.02',
- status => '1',
+ status => '6',
upd_pending => '0',
interface_mtu => '9000',
last_updated => '2015-12-10 15:44:37',
@@ -1890,7 +1890,7 @@ my %definition_for = (
ilo_ip_address => '172.16.4.11',
ilo_ip_netmask => '255.255.255.0',
last_updated => '2015-12-10 15:44:37',
- status => '1',
+ status => '6',
domain_name => 'phl.kabletown.net',
ip_gateway => '10.10.4.1',
router_host_name => 'rtr-phl.kabletown.net',
@@ -1944,7 +1944,7 @@ my %definition_for = (
phys_location => '14',
rack => 'RR 119.02',
ip_gateway => '10.10.4.1',
- status => '1',
+ status => '6',
upd_pending => '0',
domain_name => 'phl.kabletown.net',
xmpp_id => 'atsec-phl-06-dummyxmpp',
@@ -1980,7 +1980,7 @@ my %definition_for = (
router_port_name => '4',
tcp_port => '80',
phys_location => '14',
- status => '1',
+ status => '6',
ilo_ip_netmask => '255.255.255.0',
interface_name => 'bond0',
ip6_address => '2033:D0D0:3300::4:9/64',
@@ -2021,7 +2021,7 @@ my %definition_for = (
ilo_password => '',
ip_address => '10.10.4.10',
ip_gateway => '10.10.4.1',
- status => '1',
+ status => '6',
},
},
## id => 55
@@ -2050,7 +2050,7 @@ my %definition_for = (
ip_netmask => '255.255.255.0',
mgmt_ip_address => '',
router_host_name => 'rtr-east.kabletown.net',
- status => '6',
+ status => '4', #
cdn_id => '2',
ilo_password => '',
ip6_address => '2033:D0D1:3300::0:2/64',
@@ -2090,7 +2090,7 @@ my %definition_for = (
ip6_gateway => '2033:D0D1:3300::0:1',
xmpp_id => 'atsmid-east-01-dummyxmpp',
router_port_name => '0',
- status => '6',
+ status => '4', #
mgmt_ip_address => '',
cdn_id => '1',
interface_name => 'bond0',
@@ -2104,7 +2104,7 @@ my %definition_for = (
using => {
host_name => 'atsmid-east-02',
interface_mtu => '9000',
- status => '6',
+ status => '4', #
xmpp_id => 'atsmid-east-02-dummyxmpp',
ilo_ip_address => '172.17.0.8',
ip_netmask => '255.255.255.0',
@@ -2156,7 +2156,7 @@ my %definition_for = (
ilo_ip_gateway => '172.17.0.1',
interface_name => 'bond0',
router_port_name => '0',
- status => '6',
+ status => '4', #
router_host_name => 'rtr-east.kabletown.net',
xmpp_passwd => 'X',
ilo_ip_address => '172.17.0.9',
@@ -2193,7 +2193,7 @@ my %definition_for = (
xmpp_passwd => 'X',
ilo_ip_address => '172.17.0.10',
mgmt_ip_gateway => '',
- status => '6',
+ status => '4', #
interface_mtu => '9000',
upd_pending => '0',
ilo_username => '',
@@ -2219,7 +2219,7 @@ my %definition_for = (
cdn_id => '1',
ilo_ip_netmask => '255.255.255.0',
ip_address => '10.11.0.6',
- status => '6',
+ status => '4', #
xmpp_id => 'atsmid-east-05-dummyxmpp',
xmpp_passwd => 'X',
ilo_ip_gateway => '172.17.0.1',
@@ -2267,7 +2267,7 @@ my %definition_for = (
router_host_name => 'rtr-east.kabletown.net',
tcp_port => '80',
ip_netmask => '255.255.255.0',
- status => '6',
+ status => '4', #
type => '22',
domain_name => 'east.kabletown.net',
ip6_gateway => '2033:D0D1:3300::0:1',
@@ -2289,7 +2289,7 @@ my %definition_for = (
using => {
host_name => 'atsmid-east-07',
domain_name => 'east.kabletown.net',
- status => '6',
+ status => '4', #
xmpp_id => 'atsmid-east-07-dummyxmpp',
last_updated => '2015-12-10 15:44:37',
xmpp_passwd => 'X',
@@ -2354,7 +2354,7 @@ my %definition_for = (
router_host_name => 'rtr-east.kabletown.net',
ilo_ip_gateway => '172.17.0.1',
ilo_username => '',
- status => '6',
+ status => '4', #
},
},
## id => 64
@@ -2383,7 +2383,7 @@ my %definition_for = (
ilo_password => '',
interface_name => 'bond0',
profile => '15',
- status => '6',
+ status => '4', #
mgmt_ip_gateway => '',
upd_pending => '0',
tcp_port => '80',
@@ -2405,7 +2405,7 @@ my %definition_for = (
ilo_ip_netmask => '255.255.255.0',
rack => 'RR 119.02',
ip_address => '10.11.1.2',
- status => '6',
+ status => '4', #
ilo_ip_address => '172.17.1.7',
interface_name => 'bond0',
mgmt_ip_netmask => '',
@@ -2439,7 +2439,7 @@ my %definition_for = (
ilo_password => '',
ilo_username => '',
ip_netmask => '255.255.255.0',
- status => '6',
+ status => '4', #
tcp_port => '80',
cachegroup => '6',
ip_gateway => '10.11.1.1',
@@ -2483,7 +2483,7 @@ my %definition_for = (
domain_name => 'west.kabletown.net',
interface_name => 'bond0',
mgmt_ip_netmask => '',
- status => '6',
+ status => '4', #
ilo_password => '',
interface_mtu => '9000',
mgmt_ip_gateway => '',
@@ -2531,7 +2531,7 @@ my %definition_for = (
ilo_ip_gateway => '172.17.1.1',
ip6_gateway => '2033:D0D1:3300::1:1',
mgmt_ip_netmask => '',
- status => '6',
+ status => '4', #
xmpp_passwd => 'X',
domain_name => 'west.kabletown.net',
ilo_ip_netmask => '255.255.255.0',
@@ -2576,7 +2576,7 @@ my %definition_for = (
domain_name => 'west.kabletown.net',
ilo_password => '',
mgmt_ip_netmask => '',
- status => '6',
+ status => '4', #
},
},
## id => 70
@@ -2609,7 +2609,7 @@ my %definition_for = (
mgmt_ip_address => '',
phys_location => '10',
router_port_name => '1',
- status => '6',
+ status => '4', #
ilo_ip_gateway => '172.17.1.1',
ilo_ip_netmask => '255.255.255.0',
mgmt_ip_gateway => '',
@@ -2624,7 +2624,7 @@ my %definition_for = (
ilo_ip_netmask => '255.255.255.0',
ip_address => '10.11.1.8',
ilo_password => '',
- status => '6',
+ status => '4', #
xmpp_id => 'atsmid-west-07-dummyxmpp',
router_host_name => 'rtr-west.kabletown.net',
upd_pending => '0',
@@ -2682,7 +2682,7 @@ my %definition_for = (
xmpp_passwd => 'X',
ilo_ip_gateway => '172.17.1.1',
ip6_address => '2033:D0D1:3300::1:10/64',
- status => '6',
+ status => '4', #
ip_gateway => '10.11.1.1',
mgmt_ip_netmask => '',
ilo_password => '',
@@ -2696,7 +2696,7 @@ my %definition_for = (
using => {
host_name => 'org1',
ip_address => '10.11.10.2',
- status => '6',
+ status => '4', #
type => '25',
cdn_id => '1',
interface_name => 'eth1',
@@ -2738,7 +2738,7 @@ my %definition_for = (
router_port_name => '',
tcp_port => '80',
ip6_address => undef,
- status => '6',
+ status => '4', #
xmpp_passwd => '',
cdn_id => '1',
ilo_ip_address => '',
@@ -2774,7 +2774,7 @@ my %definition_for = (
interface_name => 'eth1',
ip_address => '127.0.0.5',
tcp_port => '8088',
- status => '6',
+ status => '4', #
ilo_username => '',
mgmt_ip_address => '',
rack => 'RR 119.02',
@@ -2825,7 +2825,7 @@ my %definition_for = (
ilo_password => undef,
interface_name => 'bond0',
router_host_name => undef,
- status => '6',
+ status => '4', #
tcp_port => '80',
type => '27',
ip6_address => '2033:D011:3300::335/64',
@@ -2868,7 +2868,7 @@ my %definition_for = (
ip_address => '172.39.19.49',
mgmt_ip_address => undef,
profile => '20',
- status => '6',
+ status => '4', #
ilo_password => undef,
last_updated => '2015-12-10 15:44:37',
router_host_name => undef,
@@ -2885,7 +2885,7 @@ my %definition_for = (
ip6_gateway => '2033:D021:3300::1',
ilo_ip_gateway => undef,
ip_gateway => '172.39.29.1',
- status => '6',
+ status => '4', #
xmpp_passwd => 'X',
ilo_ip_address => undef,
upd_pending => '0',
@@ -2925,7 +2925,7 @@ my %definition_for = (
ilo_ip_address => undef,
ilo_ip_gateway => undef,
ip6_address => '2033:D021:3300::334/64',
- status => '6',
+ status => '4', #
tcp_port => '80',
mgmt_ip_address => undef,
phys_location => '2',
@@ -2978,7 +2978,7 @@ my %definition_for = (
ip_netmask => '255.255.255.0',
tcp_port => '80',
router_host_name => undef,
- status => '6',
+ status => '4', #
type => '4',
ilo_password => undef,
ilo_username => undef,
@@ -3009,7 +3009,7 @@ my %definition_for = (
ilo_username => undef,
router_port_name => undef,
ilo_ip_address => undef,
- status => '6',
+ status => '4', #
interface_mtu => '9000',
last_updated => '2015-12-10 15:44:37',
ip_netmask => '255.255.255.0',
@@ -3036,7 +3036,7 @@ my %definition_for = (
mgmt_ip_address => undef,
mgmt_ip_gateway => undef,
router_host_name => undef,
- status => '6',
+ status => '4', #
type => '4',
profile => '1',
xmpp_passwd => 'X',
@@ -3079,7 +3079,7 @@ my %definition_for = (
ip6_gateway => '2033:D0D1:3300::1',
ip_address => '172.39.39.49',
ip_netmask => '255.255.255.0',
- status => '6',
+ status => '4', #
mgmt_ip_netmask => undef,
tcp_port => '80',
last_updated => '2015-12-10 15:44:37',
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/969a182e/traffic_ops/app/lib/Test/IntegrationTestHelper.pm
----------------------------------------------------------------------
diff --git a/traffic_ops/app/lib/Test/IntegrationTestHelper.pm b/traffic_ops/app/lib/Test/IntegrationTestHelper.pm
index 578cea4..7bfd023 100644
--- a/traffic_ops/app/lib/Test/IntegrationTestHelper.pm
+++ b/traffic_ops/app/lib/Test/IntegrationTestHelper.pm
@@ -133,6 +133,7 @@ sub reset_sequence_id {
stats_summary
status
tm_user
+ to_extension
type );
foreach my $name (@table_names) {
my $p = $dbh->prepare("ALTER SEQUENCE " . $name . "_id_seq RESTART WITH 1");
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/969a182e/traffic_ops/app/lib/UI/ConfigFiles.pm
----------------------------------------------------------------------
diff --git a/traffic_ops/app/lib/UI/ConfigFiles.pm b/traffic_ops/app/lib/UI/ConfigFiles.pm
index dd0dc21..6845439 100644
--- a/traffic_ops/app/lib/UI/ConfigFiles.pm
+++ b/traffic_ops/app/lib/UI/ConfigFiles.pm
@@ -343,7 +343,7 @@ sub profile_param_value {
my $param =
$self->db->resultset('ProfileParameter')
->search( { -and => [ profile => $pid, 'parameter.config_file' => $file, 'parameter.name' => $param_name ] },
- { prefetch => [ 'parameter', 'profile' ] } )->single();
+ { prefetch => [ 'parameter', 'profile' ] } )->first();
return ( defined $param ? $param->parameter->value : $default );
}
@@ -1293,7 +1293,7 @@ sub regex_revalidate_dot_config {
my $max_days =
$self->db->resultset('Parameter')->search( { name => "maxRevalDurationDays" }, { config_file => "regex_revalidate.config" } )->get_column('value')
- ->single;
+ ->first;
my $interval = "> now() - interval '$max_days day'"; # postgres
my %regex_time;
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/969a182e/traffic_ops/app/t_integration/extensions.t
----------------------------------------------------------------------
diff --git a/traffic_ops/app/t_integration/extensions.t b/traffic_ops/app/t_integration/extensions.t
index 6dfe622..6d7bbdf 100644
--- a/traffic_ops/app/t_integration/extensions.t
+++ b/traffic_ops/app/t_integration/extensions.t
@@ -22,11 +22,9 @@ my $json = JSON->new->allow_nonref;
my @etypes = ( "CHECK_EXTENSION_BOOL", "CHECK_EXTENSION_NUM" );
foreach my $num ( 1 .. 36 ) {
-
$t->get_ok('/api/1.1/to_extensions.json')->status_is(200);
my $extlist = $json->decode( $t->tx->res->content->asset->{content} );
- # diag "length is " . scalar( @{ $extlist->{response} } );
if ( scalar( @{ $extlist->{response} } ) < 31 ) {
$t->post_ok(
'/api/1.1/to_extensions' => json => {