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:24 UTC
[09/40] incubator-trafficcontrol git commit: fixed the
deliveryserviceserver fixtures, and test
fixed the deliveryserviceserver fixtures, and test
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/commit/abfcc147
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/tree/abfcc147
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/diff/abfcc147
Branch: refs/heads/psql-rebase
Commit: abfcc147c900fe15fe5a6be94f34c52eea71ce41
Parents: 028cdd3
Author: Dewayne Richardson <de...@apache.org>
Authored: Thu Nov 17 11:42:17 2016 -0700
Committer: Dan Kirkwood <da...@gmail.com>
Committed: Mon Nov 21 12:04:09 2016 -0700
----------------------------------------------------------------------
.../app/lib/Fixtures/DeliveryserviceServer.pm | 25 +++++++++-----
traffic_ops/app/lib/Fixtures/Server.pm | 36 ++++++++++----------
traffic_ops/app/t/deliveryserviceserver.t | 25 +++++++-------
3 files changed, 46 insertions(+), 40 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/abfcc147/traffic_ops/app/lib/Fixtures/DeliveryserviceServer.pm
----------------------------------------------------------------------
diff --git a/traffic_ops/app/lib/Fixtures/DeliveryserviceServer.pm b/traffic_ops/app/lib/Fixtures/DeliveryserviceServer.pm
index a518602..64e45c6 100644
--- a/traffic_ops/app/lib/Fixtures/DeliveryserviceServer.pm
+++ b/traffic_ops/app/lib/Fixtures/DeliveryserviceServer.pm
@@ -22,63 +22,70 @@ my %definition_for = (
new => 'DeliveryserviceServer',
using => {
deliveryservice => 100,
- server => 1,
+ server => 100,
},
},
test_ds1_server_edge13 => {
new => 'DeliveryserviceServer',
using => {
deliveryservice => 100,
- server => 13,
+ server => 1300,
},
},
test_ds1_server_mid1 => {
new => 'DeliveryserviceServer',
using => {
deliveryservice => 100,
- server => 2,
+ server => 300,
},
},
test_ds2_server_edge1 => {
new => 'DeliveryserviceServer',
using => {
deliveryservice => 200,
- server => 7,
+ server => 700,
},
},
test_ds2_server_mid1 => {
new => 'DeliveryserviceServer',
using => {
deliveryservice => 200,
- server => 8,
+ server => 800,
},
},
test_ds5_server_edge14 => {
new => 'DeliveryserviceServer',
using => {
deliveryservice => 500,
- server => 14,
+ server => 1400,
},
},
test_ds5_server_edge15 => {
new => 'DeliveryserviceServer',
using => {
deliveryservice => 500,
- server => 15,
+ server => 1500,
},
},
test_ds6_server_edge14 => {
new => 'DeliveryserviceServer',
using => {
deliveryservice => 600,
- server => 14,
+ server => 1400,
},
},
test_ds6_server_edge15 => {
new => 'DeliveryserviceServer',
using => {
deliveryservice => 600,
- server => 15,
+ server => 1500,
+ },
+ },
+ test_steering_ds1 => {
+ new => 'DeliveryserviceServer',
+ using => {
+ deliveryservice => 700,
+ server => 900,
},
},
);
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/abfcc147/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 47348b9..24f0b34 100644
--- a/traffic_ops/app/lib/Fixtures/Server.pm
+++ b/traffic_ops/app/lib/Fixtures/Server.pm
@@ -21,7 +21,7 @@ my %definition_for = (
server_edge1 => {
new => 'Server',
using => {
- id => 1,
+ id => 100,
host_name => 'atlanta-edge-01',
domain_name => 'ga.atlanta.kabletown.net',
tcp_port => 80,
@@ -56,7 +56,7 @@ my %definition_for = (
server_mid1 => {
new => 'Server',
using => {
- id => 2,
+ id => 200,
host_name => 'atlanta-mid-01',
domain_name => 'ga.atlanta.kabletown.net',
tcp_port => 80,
@@ -91,7 +91,7 @@ my %definition_for = (
rascal_server => {
new => 'Server',
using => {
- id => 4,
+ id => 300,
host_name => 'rascal01',
domain_name => 'kabletown.net',
tcp_port => 81,
@@ -126,7 +126,7 @@ my %definition_for = (
riak_server1 => {
new => 'Server',
using => {
- id => 5,
+ id => 400,
host_name => 'riak01',
domain_name => 'kabletown.net',
tcp_port => 8088,
@@ -161,7 +161,7 @@ my %definition_for = (
rascal_server2 => {
new => 'Server',
using => {
- id => 6,
+ id => 500,
host_name => 'rascal02',
domain_name => 'kabletown.net',
tcp_port => 81,
@@ -196,7 +196,7 @@ my %definition_for = (
server_edge2 => {
new => 'Server',
using => {
- id => 7,
+ id => 600,
host_name => 'atlanta-edge-02',
domain_name => 'ga.atlanta.kabletown.net',
tcp_port => 80,
@@ -231,7 +231,7 @@ my %definition_for = (
server_mid2 => {
new => 'Server',
using => {
- id => 8,
+ id => 700,
host_name => 'atlanta-mid-02',
domain_name => 'ga.atlanta.kabletown.net',
tcp_port => 80,
@@ -266,7 +266,7 @@ my %definition_for = (
riak_server2 => {
new => 'Server',
using => {
- id => 9,
+ id => 800,
host_name => 'riak02',
domain_name => 'kabletown.net',
tcp_port => 8088,
@@ -301,7 +301,7 @@ my %definition_for = (
influxdb_server1 => {
new => 'Server',
using => {
- id => 10,
+ id => 900,
host_name => 'influxdb01',
domain_name => 'kabletown.net',
tcp_port => 8086,
@@ -336,7 +336,7 @@ my %definition_for = (
influxdb_server2 => {
new => 'Server',
using => {
- id => 11,
+ id => 1000,
host_name => 'influxdb02',
domain_name => 'kabletown.net',
tcp_port => 8086,
@@ -371,7 +371,7 @@ my %definition_for = (
server_router => {
new => 'Server',
using => {
- id => 12,
+ id => 1100,
host_name => 'atlanta-router-01',
domain_name => 'ga.atlanta.kabletown.net',
tcp_port => 80,
@@ -406,7 +406,7 @@ my %definition_for = (
server_edge_reported => {
new => 'Server',
using => {
- id => 13,
+ id => 1200,
host_name => 'atlanta-edge-03',
domain_name => 'ga.atlanta.kabletown.net',
tcp_port => 80,
@@ -438,10 +438,10 @@ my %definition_for = (
phys_location => 1,
},
},
- server_edge14 => {
+ server_edge13 => {
new => 'Server',
using => {
- id => 14,
+ id => 1300,
host_name => 'atlanta-edge-14',
domain_name => 'ga.atlanta.kabletown.net',
tcp_port => 80,
@@ -473,10 +473,10 @@ my %definition_for = (
phys_location => 1,
},
},
- server_edge15 => {
+ server_edge14 => {
new => 'Server',
using => {
- id => 15,
+ id => 1400,
host_name => 'atlanta-edge-15',
domain_name => 'ga.atlanta.kabletown.net',
tcp_port => 80,
@@ -508,10 +508,10 @@ my %definition_for = (
phys_location => 1,
},
},
- server_mid16 => {
+ server_mid15 => {
new => 'Server',
using => {
- id => 16,
+ id => 1500,
host_name => 'atlanta-mid-16',
domain_name => 'ga.atlanta.kabletown.net',
tcp_port => 80,
http://git-wip-us.apache.org/repos/asf/incubator-trafficcontrol/blob/abfcc147/traffic_ops/app/t/deliveryserviceserver.t
----------------------------------------------------------------------
diff --git a/traffic_ops/app/t/deliveryserviceserver.t b/traffic_ops/app/t/deliveryserviceserver.t
index 759840e..c11ae4e 100644
--- a/traffic_ops/app/t/deliveryserviceserver.t
+++ b/traffic_ops/app/t/deliveryserviceserver.t
@@ -44,41 +44,40 @@ ok $t->post_ok( '/login', => form => { u => Test::TestHelper::ADMIN_USER, p => T
ok $t->post_ok(
'/create/dsserver',
=> form => {
- server => '1',
- deliveryservice => '2'
+ server => '100',
+ deliveryservice => '200'
}
)->status_is(302), "create deliveryservice_server";
# validate ds_server was created
-ok $t->get_ok('/datadeliveryserviceserver')->status_is(200)->json_is( '/1/deliveryservice' => 'test-ds1' )->json_is( '/1/server' => '1' ),
+ok $t->get_ok('/datadeliveryserviceserver')->status_is(200)->json_is( '/1/deliveryservice' => 'test-ds1' )->json_is( '/1/server' => '300' ),
"validate deliveryservice_server was added";
# validate edit route
-ok $t->get_ok('/dss/1/edit')->status_is(200), "validate edit screen";
+ok $t->get_ok('/dss/200/edit')->status_is(200), "validate edit screen";
#assign_servers
ok $t->post_ok(
- '/dss/1/update' => form => {
- 'id' => '1',
- 'serverid_2' => 'on',
- 'serverid_1' => 'off'
+ '/dss/100/update' => form => {
+ 'serverid_200' => 'on',
+ 'serverid_100' => 'off'
}
)->status_is(302), "assign server to ds";
#clone_server
ok $t->post_ok(
- '/update/cpdss/2' => form => {
- 'from_server' => '1',
- 'to_server' => '2',
+ '/update/cpdss/200' => form => {
+ 'from_server' => '100',
+ 'to_server' => '200',
}
)->status_is(302), "clone server";
#validate clone
-ok $t->get_ok('/datadeliveryserviceserver')->status_is(200)->json_is( '/1/deliveryservice' => 'steering-ds2' )->json_is( '/1/server' => '2' ),
+ok $t->get_ok('/datadeliveryserviceserver')->status_is(200)->json_is( '/8/deliveryservice' => 'steering-ds1' )->json_is( '/8/server' => '900' ),
"validate deliveryservice was cloned";
#validate cp dss view
-ok $t->get_ok('/cpdssiframe/view/1')->status_is(200), "cpdss iframe";
+ok $t->get_ok('/cpdssiframe/view/100')->status_is(200), "cpdss iframe";
ok $t->get_ok('/logout')->status_is(302)->or( sub { diag $t->tx->res->content->asset->{content}; } );
$dbh->disconnect();